From f82b7036e8e6068411853610dd8ce01265b99719 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Wed, 18 Nov 2009 19:22:58 +0000 Subject: [PATCH] Rebake after last commit. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 36 +- autoconf_inc.m4 | 6 + build/bakefiles/common.bkl | 13 +- build/bakefiles/config.bkl | 9 + build/bakefiles/files.bkl | 2 +- build/msw/config.bcc | 429 +- build/msw/config.gcc | 297 +- build/msw/config.vc | 301 +- build/msw/config.wat | 283 +- build/msw/makefile.bcc | 28623 +++++++-------- build/msw/makefile.gcc | 28946 +++++++-------- build/msw/makefile.vc | 29780 ++++++++-------- build/msw/makefile.wat | 29456 +++++++-------- build/msw/wx_core.dsp | 28 +- build/msw/wx_vc7_adv.vcproj | 26 +- build/msw/wx_vc7_aui.vcproj | 8 +- build/msw/wx_vc7_base.vcproj | 8 +- build/msw/wx_vc7_core.vcproj | 29 +- build/msw/wx_vc7_gl.vcproj | 8 +- build/msw/wx_vc7_html.vcproj | 8 +- build/msw/wx_vc7_media.vcproj | 8 +- build/msw/wx_vc7_net.vcproj | 8 +- build/msw/wx_vc7_propgrid.vcproj | 8 +- build/msw/wx_vc7_qa.vcproj | 8 +- build/msw/wx_vc7_ribbon.vcproj | 8 +- build/msw/wx_vc7_richtext.vcproj | 8 +- build/msw/wx_vc7_stc.vcproj | 8 +- build/msw/wx_vc7_xml.vcproj | 8 +- build/msw/wx_vc7_xrc.vcproj | 8 +- build/msw/wx_vc8_adv.vcproj | 32 +- build/msw/wx_vc8_aui.vcproj | 8 +- build/msw/wx_vc8_base.vcproj | 8 +- build/msw/wx_vc8_core.vcproj | 36 +- build/msw/wx_vc8_gl.vcproj | 8 +- build/msw/wx_vc8_html.vcproj | 8 +- build/msw/wx_vc8_media.vcproj | 8 +- build/msw/wx_vc8_net.vcproj | 8 +- build/msw/wx_vc8_propgrid.vcproj | 8 +- build/msw/wx_vc8_qa.vcproj | 8 +- build/msw/wx_vc8_ribbon.vcproj | 8 +- build/msw/wx_vc8_richtext.vcproj | 8 +- build/msw/wx_vc8_stc.vcproj | 8 +- build/msw/wx_vc8_xml.vcproj | 8 +- build/msw/wx_vc8_xrc.vcproj | 8 +- build/msw/wx_vc9_adv.vcproj | 32 +- build/msw/wx_vc9_aui.vcproj | 8 +- build/msw/wx_vc9_base.vcproj | 8 +- build/msw/wx_vc9_core.vcproj | 36 +- build/msw/wx_vc9_gl.vcproj | 8 +- build/msw/wx_vc9_html.vcproj | 8 +- build/msw/wx_vc9_media.vcproj | 8 +- build/msw/wx_vc9_net.vcproj | 8 +- build/msw/wx_vc9_propgrid.vcproj | 8 +- build/msw/wx_vc9_qa.vcproj | 8 +- build/msw/wx_vc9_ribbon.vcproj | 8 +- build/msw/wx_vc9_richtext.vcproj | 8 +- build/msw/wx_vc9_stc.vcproj | 8 +- build/msw/wx_vc9_xml.vcproj | 8 +- build/msw/wx_vc9_xrc.vcproj | 8 +- demos/Makefile.in | 2 +- demos/bombs/bombs_vc7.vcproj | 16 +- demos/bombs/bombs_vc8.vcproj | 16 +- demos/bombs/bombs_vc9.vcproj | 16 +- demos/bombs/makefile.bcc | 23 +- demos/bombs/makefile.gcc | 23 +- demos/bombs/makefile.vc | 23 +- demos/bombs/makefile.wat | 24 +- demos/forty/forty_vc7.vcproj | 16 +- demos/forty/forty_vc8.vcproj | 16 +- demos/forty/forty_vc9.vcproj | 16 +- demos/forty/makefile.bcc | 23 +- demos/forty/makefile.gcc | 23 +- demos/forty/makefile.vc | 23 +- demos/forty/makefile.wat | 24 +- demos/fractal/fractal_vc7.vcproj | 16 +- demos/fractal/fractal_vc8.vcproj | 16 +- demos/fractal/fractal_vc9.vcproj | 16 +- demos/fractal/makefile.bcc | 23 +- demos/fractal/makefile.gcc | 23 +- demos/fractal/makefile.vc | 23 +- demos/fractal/makefile.wat | 24 +- demos/life/life_vc7.vcproj | 16 +- demos/life/life_vc8.vcproj | 16 +- demos/life/life_vc9.vcproj | 16 +- demos/life/makefile.bcc | 23 +- demos/life/makefile.gcc | 22 +- demos/life/makefile.vc | 23 +- demos/life/makefile.wat | 24 +- demos/makefile.bcc | 207 +- demos/makefile.gcc | 143 +- demos/makefile.vc | 169 +- demos/makefile.wat | 209 +- demos/poem/makefile.bcc | 23 +- demos/poem/makefile.gcc | 23 +- demos/poem/makefile.vc | 23 +- demos/poem/makefile.wat | 24 +- demos/poem/poem_vc7.vcproj | 16 +- demos/poem/poem_vc8.vcproj | 16 +- demos/poem/poem_vc9.vcproj | 16 +- samples/access/Makefile.in | 2 +- samples/access/access_vc7.vcproj | 16 +- samples/access/access_vc8.vcproj | 16 +- samples/access/access_vc9.vcproj | 16 +- samples/access/makefile.bcc | 477 +- samples/access/makefile.gcc | 465 +- samples/access/makefile.vc | 685 +- samples/access/makefile.wat | 532 +- samples/animate/Makefile.in | 2 +- samples/animate/anitest_vc7.vcproj | 16 +- samples/animate/anitest_vc8.vcproj | 16 +- samples/animate/anitest_vc9.vcproj | 16 +- samples/animate/makefile.bcc | 493 +- samples/animate/makefile.gcc | 481 +- samples/animate/makefile.vc | 701 +- samples/animate/makefile.wat | 550 +- samples/artprov/Makefile.in | 2 +- samples/artprov/artprov_vc7.vcproj | 16 +- samples/artprov/artprov_vc8.vcproj | 16 +- samples/artprov/artprov_vc9.vcproj | 16 +- samples/artprov/makefile.bcc | 485 +- samples/artprov/makefile.gcc | 473 +- samples/artprov/makefile.vc | 693 +- samples/artprov/makefile.wat | 540 +- samples/aui/Makefile.in | 2 +- samples/aui/auidemo_vc7.vcproj | 16 +- samples/aui/auidemo_vc8.vcproj | 16 +- samples/aui/auidemo_vc9.vcproj | 16 +- samples/aui/makefile.bcc | 509 +- samples/aui/makefile.gcc | 497 +- samples/aui/makefile.vc | 717 +- samples/aui/makefile.wat | 572 +- samples/calendar/Makefile.in | 2 +- samples/calendar/calendar_vc7.vcproj | 16 +- samples/calendar/calendar_vc8.vcproj | 16 +- samples/calendar/calendar_vc9.vcproj | 16 +- samples/calendar/makefile.bcc | 485 +- samples/calendar/makefile.gcc | 473 +- samples/calendar/makefile.vc | 693 +- samples/calendar/makefile.wat | 542 +- samples/caret/Makefile.in | 2 +- samples/caret/caret_vc7.vcproj | 16 +- samples/caret/caret_vc8.vcproj | 16 +- samples/caret/caret_vc9.vcproj | 16 +- samples/caret/makefile.bcc | 477 +- samples/caret/makefile.gcc | 465 +- samples/caret/makefile.vc | 685 +- samples/caret/makefile.wat | 532 +- samples/clipboard/Makefile.in | 2 +- samples/clipboard/clipboard_vc7.vcproj | 16 +- samples/clipboard/clipboard_vc8.vcproj | 16 +- samples/clipboard/clipboard_vc9.vcproj | 16 +- samples/clipboard/makefile.bcc | 477 +- samples/clipboard/makefile.gcc | 465 +- samples/clipboard/makefile.vc | 685 +- samples/clipboard/makefile.wat | 532 +- samples/collpane/Makefile.in | 2 +- samples/collpane/collpane_vc7.vcproj | 16 +- samples/collpane/collpane_vc8.vcproj | 16 +- samples/collpane/collpane_vc9.vcproj | 16 +- samples/collpane/makefile.bcc | 485 +- samples/collpane/makefile.gcc | 473 +- samples/collpane/makefile.vc | 693 +- samples/collpane/makefile.wat | 542 +- samples/combo/Makefile.in | 2 +- samples/combo/combo_vc7.vcproj | 16 +- samples/combo/combo_vc8.vcproj | 16 +- samples/combo/combo_vc9.vcproj | 16 +- samples/combo/makefile.bcc | 493 +- samples/combo/makefile.gcc | 481 +- samples/combo/makefile.vc | 701 +- samples/combo/makefile.wat | 550 +- samples/config/Makefile.in | 2 +- samples/config/config_vc7.vcproj | 16 +- samples/config/config_vc8.vcproj | 16 +- samples/config/config_vc9.vcproj | 16 +- samples/config/makefile.bcc | 477 +- samples/config/makefile.gcc | 465 +- samples/config/makefile.vc | 685 +- samples/config/makefile.wat | 532 +- samples/console/Makefile.in | 2 +- samples/console/console_vc7.vcproj | 16 +- samples/console/console_vc8.vcproj | 16 +- samples/console/console_vc9.vcproj | 16 +- samples/console/makefile.bcc | 398 +- samples/console/makefile.gcc | 384 +- samples/console/makefile.vc | 566 +- samples/console/makefile.wat | 509 +- samples/controls/Makefile.in | 2 +- samples/controls/controls_vc7.vcproj | 16 +- samples/controls/controls_vc8.vcproj | 16 +- samples/controls/controls_vc9.vcproj | 16 +- samples/controls/makefile.bcc | 485 +- samples/controls/makefile.gcc | 473 +- samples/controls/makefile.vc | 693 +- samples/controls/makefile.wat | 540 +- samples/dataview/Makefile.in | 2 +- samples/dataview/dataview_vc7.vcproj | 16 +- samples/dataview/dataview_vc8.vcproj | 16 +- samples/dataview/dataview_vc9.vcproj | 16 +- samples/dataview/makefile.bcc | 493 +- samples/dataview/makefile.gcc | 481 +- samples/dataview/makefile.vc | 701 +- samples/dataview/makefile.wat | 550 +- samples/debugrpt/Makefile.in | 2 +- samples/debugrpt/debugrpt_vc7.vcproj | 16 +- samples/debugrpt/debugrpt_vc8.vcproj | 16 +- samples/debugrpt/debugrpt_vc9.vcproj | 16 +- samples/debugrpt/makefile.bcc | 493 +- samples/debugrpt/makefile.gcc | 481 +- samples/debugrpt/makefile.vc | 701 +- samples/debugrpt/makefile.wat | 552 +- samples/dialogs/Makefile.in | 2 +- samples/dialogs/dialogs_vc7.vcproj | 16 +- samples/dialogs/dialogs_vc8.vcproj | 16 +- samples/dialogs/dialogs_vc9.vcproj | 16 +- samples/dialogs/makefile.bcc | 533 +- samples/dialogs/makefile.gcc | 525 +- samples/dialogs/makefile.vc | 741 +- samples/dialogs/makefile.wat | 596 +- samples/dialup/Makefile.in | 2 +- samples/dialup/dialup_vc7.vcproj | 16 +- samples/dialup/dialup_vc8.vcproj | 16 +- samples/dialup/dialup_vc9.vcproj | 16 +- samples/dialup/makefile.bcc | 477 +- samples/dialup/makefile.gcc | 465 +- samples/dialup/makefile.vc | 685 +- samples/dialup/makefile.wat | 532 +- samples/display/Makefile.in | 2 +- samples/display/display_vc7.vcproj | 16 +- samples/display/display_vc8.vcproj | 16 +- samples/display/display_vc9.vcproj | 16 +- samples/display/makefile.bcc | 477 +- samples/display/makefile.gcc | 465 +- samples/display/makefile.vc | 685 +- samples/display/makefile.wat | 532 +- samples/dnd/Makefile.in | 2 +- samples/dnd/dnd_vc7.vcproj | 16 +- samples/dnd/dnd_vc8.vcproj | 16 +- samples/dnd/dnd_vc9.vcproj | 16 +- samples/dnd/makefile.bcc | 485 +- samples/dnd/makefile.gcc | 472 +- samples/dnd/makefile.vc | 693 +- samples/dnd/makefile.wat | 540 +- samples/docview/Makefile.in | 2 +- samples/docview/docview_vc7.vcproj | 16 +- samples/docview/docview_vc8.vcproj | 16 +- samples/docview/docview_vc9.vcproj | 16 +- samples/docview/makefile.bcc | 493 +- samples/docview/makefile.gcc | 481 +- samples/docview/makefile.vc | 701 +- samples/docview/makefile.wat | 548 +- samples/dragimag/Makefile.in | 2 +- samples/dragimag/dragimag_vc7.vcproj | 16 +- samples/dragimag/dragimag_vc8.vcproj | 16 +- samples/dragimag/dragimag_vc9.vcproj | 16 +- samples/dragimag/makefile.bcc | 485 +- samples/dragimag/makefile.gcc | 473 +- samples/dragimag/makefile.vc | 693 +- samples/dragimag/makefile.wat | 540 +- samples/drawing/Makefile.in | 2 +- samples/drawing/drawing_vc7.vcproj | 16 +- samples/drawing/drawing_vc8.vcproj | 16 +- samples/drawing/drawing_vc9.vcproj | 16 +- samples/drawing/makefile.bcc | 485 +- samples/drawing/makefile.gcc | 473 +- samples/drawing/makefile.vc | 693 +- samples/drawing/makefile.wat | 540 +- samples/erase/Makefile.in | 2 +- samples/erase/erase_vc7.vcproj | 16 +- samples/erase/erase_vc8.vcproj | 16 +- samples/erase/erase_vc9.vcproj | 16 +- samples/erase/makefile.bcc | 477 +- samples/erase/makefile.gcc | 465 +- samples/erase/makefile.vc | 685 +- samples/erase/makefile.wat | 532 +- samples/event/Makefile.in | 2 +- samples/event/event_vc7.vcproj | 16 +- samples/event/event_vc8.vcproj | 16 +- samples/event/event_vc9.vcproj | 16 +- samples/event/makefile.bcc | 477 +- samples/event/makefile.gcc | 465 +- samples/event/makefile.vc | 685 +- samples/event/makefile.wat | 532 +- samples/except/Makefile.in | 2 +- samples/except/except_vc7.vcproj | 16 +- samples/except/except_vc8.vcproj | 16 +- samples/except/except_vc9.vcproj | 16 +- samples/except/makefile.bcc | 477 +- samples/except/makefile.gcc | 465 +- samples/except/makefile.vc | 685 +- samples/except/makefile.wat | 532 +- samples/exec/Makefile.in | 2 +- samples/exec/exec_vc7.vcproj | 16 +- samples/exec/exec_vc8.vcproj | 16 +- samples/exec/exec_vc9.vcproj | 16 +- samples/exec/makefile.bcc | 477 +- samples/exec/makefile.gcc | 464 +- samples/exec/makefile.vc | 685 +- samples/exec/makefile.wat | 532 +- samples/flash/flash_vc7.vcproj | 16 +- samples/flash/flash_vc8.vcproj | 16 +- samples/flash/flash_vc9.vcproj | 16 +- samples/flash/makefile.vc | 685 +- samples/font/Makefile.in | 2 +- samples/font/font_vc7.vcproj | 16 +- samples/font/font_vc8.vcproj | 16 +- samples/font/font_vc9.vcproj | 16 +- samples/font/makefile.bcc | 477 +- samples/font/makefile.gcc | 464 +- samples/font/makefile.vc | 685 +- samples/font/makefile.wat | 532 +- samples/fswatcher/fswatcher_vc7.vcproj | 16 +- samples/fswatcher/fswatcher_vc8.vcproj | 16 +- samples/fswatcher/fswatcher_vc9.vcproj | 16 +- samples/fswatcher/makefile.bcc | 23 +- samples/fswatcher/makefile.gcc | 23 +- samples/fswatcher/makefile.vc | 23 +- samples/fswatcher/makefile.wat | 24 +- samples/grid/Makefile.in | 2 +- samples/grid/grid_vc7.vcproj | 16 +- samples/grid/grid_vc8.vcproj | 16 +- samples/grid/grid_vc9.vcproj | 16 +- samples/grid/makefile.bcc | 485 +- samples/grid/makefile.gcc | 472 +- samples/grid/makefile.vc | 693 +- samples/grid/makefile.wat | 542 +- samples/help/Makefile.in | 2 +- samples/help/help_vc7.vcproj | 16 +- samples/help/help_vc8.vcproj | 16 +- samples/help/help_vc9.vcproj | 16 +- samples/help/makefile.bcc | 509 +- samples/help/makefile.gcc | 496 +- samples/help/makefile.vc | 717 +- samples/help/makefile.wat | 568 +- samples/htlbox/Makefile.in | 2 +- samples/htlbox/htlbox_vc7.vcproj | 16 +- samples/htlbox/htlbox_vc8.vcproj | 16 +- samples/htlbox/htlbox_vc9.vcproj | 16 +- samples/htlbox/makefile.bcc | 485 +- samples/htlbox/makefile.gcc | 473 +- samples/htlbox/makefile.vc | 693 +- samples/htlbox/makefile.wat | 542 +- samples/html/Makefile.in | 2 +- samples/html/about/Makefile.in | 2 +- samples/html/about/about_vc7.vcproj | 16 +- samples/html/about/about_vc8.vcproj | 16 +- samples/html/about/about_vc9.vcproj | 16 +- samples/html/about/makefile.bcc | 493 +- samples/html/about/makefile.gcc | 481 +- samples/html/about/makefile.vc | 701 +- samples/html/about/makefile.wat | 550 +- samples/html/help/Makefile.in | 2 +- samples/html/help/help_vc7.vcproj | 16 +- samples/html/help/help_vc8.vcproj | 16 +- samples/html/help/help_vc9.vcproj | 16 +- samples/html/help/makefile.bcc | 493 +- samples/html/help/makefile.gcc | 481 +- samples/html/help/makefile.vc | 701 +- samples/html/help/makefile.wat | 550 +- samples/html/helpview/Makefile.in | 2 +- samples/html/helpview/helpview_vc7.vcproj | 16 +- samples/html/helpview/helpview_vc8.vcproj | 16 +- samples/html/helpview/helpview_vc9.vcproj | 16 +- samples/html/helpview/makefile.bcc | 493 +- samples/html/helpview/makefile.gcc | 481 +- samples/html/helpview/makefile.vc | 701 +- samples/html/helpview/makefile.wat | 550 +- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/makefile.bcc | 267 +- samples/html/makefile.gcc | 167 +- samples/html/makefile.unx | 2 +- samples/html/makefile.vc | 217 +- samples/html/makefile.wat | 257 +- samples/html/printing/Makefile.in | 2 +- samples/html/printing/makefile.bcc | 493 +- samples/html/printing/makefile.gcc | 481 +- samples/html/printing/makefile.vc | 701 +- samples/html/printing/makefile.wat | 550 +- samples/html/printing/printing_vc7.vcproj | 16 +- samples/html/printing/printing_vc8.vcproj | 16 +- samples/html/printing/printing_vc9.vcproj | 16 +- samples/html/test/Makefile.in | 2 +- samples/html/test/makefile.bcc | 501 +- samples/html/test/makefile.gcc | 488 +- samples/html/test/makefile.vc | 709 +- samples/html/test/makefile.wat | 560 +- samples/html/test/test_vc7.vcproj | 16 +- samples/html/test/test_vc8.vcproj | 16 +- samples/html/test/test_vc9.vcproj | 16 +- samples/html/virtual/Makefile.in | 2 +- samples/html/virtual/makefile.bcc | 493 +- samples/html/virtual/makefile.gcc | 481 +- samples/html/virtual/makefile.vc | 701 +- samples/html/virtual/makefile.wat | 550 +- samples/html/virtual/virtual_vc7.vcproj | 16 +- samples/html/virtual/virtual_vc8.vcproj | 16 +- samples/html/virtual/virtual_vc9.vcproj | 16 +- samples/html/widget/Makefile.in | 2 +- samples/html/widget/makefile.bcc | 493 +- samples/html/widget/makefile.gcc | 481 +- samples/html/widget/makefile.vc | 701 +- samples/html/widget/makefile.wat | 550 +- samples/html/widget/widget_vc7.vcproj | 16 +- samples/html/widget/widget_vc8.vcproj | 16 +- samples/html/widget/widget_vc9.vcproj | 16 +- samples/html/zip/Makefile.in | 2 +- samples/html/zip/makefile.bcc | 493 +- samples/html/zip/makefile.gcc | 480 +- samples/html/zip/makefile.vc | 701 +- samples/html/zip/makefile.wat | 550 +- samples/html/zip/zip_vc7.vcproj | 16 +- samples/html/zip/zip_vc8.vcproj | 16 +- samples/html/zip/zip_vc9.vcproj | 16 +- samples/image/Makefile.in | 2 +- samples/image/image_vc7.vcproj | 16 +- samples/image/image_vc8.vcproj | 16 +- samples/image/image_vc9.vcproj | 16 +- samples/image/makefile.bcc | 493 +- samples/image/makefile.gcc | 481 +- samples/image/makefile.vc | 701 +- samples/image/makefile.wat | 548 +- samples/internat/Makefile.in | 2 +- samples/internat/internat_vc7.vcproj | 16 +- samples/internat/internat_vc8.vcproj | 16 +- samples/internat/internat_vc9.vcproj | 16 +- samples/internat/makefile.bcc | 573 +- samples/internat/makefile.gcc | 561 +- samples/internat/makefile.vc | 781 +- samples/internat/makefile.wat | 628 +- samples/ipc/Makefile.in | 2 +- samples/ipc/ipc_vc7_baseipcclient.vcproj | 16 +- samples/ipc/ipc_vc7_baseipcserver.vcproj | 16 +- samples/ipc/ipc_vc7_ipcclient.vcproj | 16 +- samples/ipc/ipc_vc7_ipcserver.vcproj | 16 +- samples/ipc/ipc_vc8_baseipcclient.vcproj | 16 +- samples/ipc/ipc_vc8_baseipcserver.vcproj | 16 +- samples/ipc/ipc_vc8_ipcclient.vcproj | 16 +- samples/ipc/ipc_vc8_ipcserver.vcproj | 16 +- samples/ipc/ipc_vc9_baseipcclient.vcproj | 16 +- samples/ipc/ipc_vc9_baseipcserver.vcproj | 16 +- samples/ipc/ipc_vc9_ipcclient.vcproj | 16 +- samples/ipc/ipc_vc9_ipcserver.vcproj | 16 +- samples/ipc/makefile.bcc | 646 +- samples/ipc/makefile.gcc | 600 +- samples/ipc/makefile.vc | 958 +- samples/ipc/makefile.wat | 720 +- samples/joytest/Makefile.in | 2 +- samples/joytest/joytest_vc7.vcproj | 16 +- samples/joytest/joytest_vc8.vcproj | 16 +- samples/joytest/joytest_vc9.vcproj | 16 +- samples/joytest/makefile.bcc | 485 +- samples/joytest/makefile.gcc | 473 +- samples/joytest/makefile.vc | 693 +- samples/joytest/makefile.wat | 542 +- samples/keyboard/Makefile.in | 2 +- samples/keyboard/keyboard_vc7.vcproj | 16 +- samples/keyboard/keyboard_vc8.vcproj | 16 +- samples/keyboard/keyboard_vc9.vcproj | 16 +- samples/keyboard/makefile.bcc | 477 +- samples/keyboard/makefile.gcc | 465 +- samples/keyboard/makefile.vc | 685 +- samples/keyboard/makefile.wat | 532 +- samples/layout/Makefile.in | 2 +- samples/layout/layout_vc7.vcproj | 16 +- samples/layout/layout_vc8.vcproj | 16 +- samples/layout/layout_vc9.vcproj | 16 +- samples/layout/makefile.bcc | 477 +- samples/layout/makefile.gcc | 465 +- samples/layout/makefile.vc | 685 +- samples/layout/makefile.wat | 532 +- samples/listctrl/Makefile.in | 2 +- samples/listctrl/listctrl_vc7.vcproj | 16 +- samples/listctrl/listctrl_vc8.vcproj | 16 +- samples/listctrl/listctrl_vc9.vcproj | 16 +- samples/listctrl/makefile.bcc | 477 +- samples/listctrl/makefile.gcc | 465 +- samples/listctrl/makefile.vc | 685 +- samples/listctrl/makefile.wat | 532 +- samples/makefile.bcc | 1647 +- samples/makefile.gcc | 733 +- samples/makefile.vc | 1353 +- samples/makefile.wat | 1361 +- samples/mdi/Makefile.in | 2 +- samples/mdi/makefile.bcc | 477 +- samples/mdi/makefile.gcc | 464 +- samples/mdi/makefile.vc | 685 +- samples/mdi/makefile.wat | 532 +- samples/mdi/mdi_vc7.vcproj | 16 +- samples/mdi/mdi_vc8.vcproj | 16 +- samples/mdi/mdi_vc9.vcproj | 16 +- samples/mediaplayer/Makefile.in | 2 +- samples/mediaplayer/makefile.bcc | 485 +- samples/mediaplayer/makefile.gcc | 477 +- samples/mediaplayer/makefile.vc | 693 +- samples/mediaplayer/makefile.wat | 546 +- samples/mediaplayer/mediaplayer_vc7.vcproj | 16 +- samples/mediaplayer/mediaplayer_vc8.vcproj | 16 +- samples/mediaplayer/mediaplayer_vc9.vcproj | 16 +- samples/memcheck/Makefile.in | 2 +- samples/memcheck/makefile.bcc | 477 +- samples/memcheck/makefile.gcc | 465 +- samples/memcheck/makefile.vc | 685 +- samples/memcheck/makefile.wat | 532 +- samples/memcheck/memcheck_vc7.vcproj | 16 +- samples/memcheck/memcheck_vc8.vcproj | 16 +- samples/memcheck/memcheck_vc9.vcproj | 16 +- samples/menu/Makefile.in | 2 +- samples/menu/makefile.bcc | 477 +- samples/menu/makefile.gcc | 464 +- samples/menu/makefile.vc | 685 +- samples/menu/makefile.wat | 532 +- samples/menu/menu_vc7.vcproj | 16 +- samples/menu/menu_vc8.vcproj | 16 +- samples/menu/menu_vc9.vcproj | 16 +- samples/mfc/makefile.vc | 685 +- samples/mfc/mfc_vc7.vcproj | 16 +- samples/mfc/mfc_vc8.vcproj | 16 +- samples/mfc/mfc_vc9.vcproj | 16 +- samples/minimal/Makefile.in | 2 +- samples/minimal/makefile.bcc | 477 +- samples/minimal/makefile.gcc | 465 +- samples/minimal/makefile.vc | 685 +- samples/minimal/makefile.wat | 532 +- samples/minimal/minimal_vc7.vcproj | 16 +- samples/minimal/minimal_vc8.vcproj | 16 +- samples/minimal/minimal_vc9.vcproj | 16 +- samples/nativdlg/Makefile.in | 2 +- samples/nativdlg/makefile.bcc | 477 +- samples/nativdlg/makefile.gcc | 465 +- samples/nativdlg/makefile.vc | 685 +- samples/nativdlg/makefile.wat | 532 +- samples/nativdlg/nativdlg_vc7.vcproj | 16 +- samples/nativdlg/nativdlg_vc8.vcproj | 16 +- samples/nativdlg/nativdlg_vc9.vcproj | 16 +- samples/notebook/Makefile.in | 2 +- samples/notebook/makefile.bcc | 477 +- samples/notebook/makefile.gcc | 465 +- samples/notebook/makefile.vc | 685 +- samples/notebook/makefile.wat | 532 +- samples/notebook/notebook_vc7.vcproj | 16 +- samples/notebook/notebook_vc8.vcproj | 16 +- samples/notebook/notebook_vc9.vcproj | 16 +- samples/oleauto/Makefile.in | 2 +- samples/oleauto/makefile.bcc | 477 +- samples/oleauto/makefile.gcc | 465 +- samples/oleauto/makefile.vc | 685 +- samples/oleauto/makefile.wat | 532 +- samples/oleauto/oleauto_vc7.vcproj | 16 +- samples/oleauto/oleauto_vc8.vcproj | 16 +- samples/oleauto/oleauto_vc9.vcproj | 16 +- samples/opengl/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/cube/cube_vc7.vcproj | 16 +- samples/opengl/cube/cube_vc8.vcproj | 16 +- samples/opengl/cube/cube_vc9.vcproj | 16 +- samples/opengl/cube/makefile.bcc | 487 +- samples/opengl/cube/makefile.gcc | 474 +- samples/opengl/cube/makefile.vc | 695 +- samples/opengl/cube/makefile.wat | 544 +- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/isosurf/isosurf_vc7.vcproj | 16 +- samples/opengl/isosurf/isosurf_vc8.vcproj | 16 +- samples/opengl/isosurf/isosurf_vc9.vcproj | 16 +- samples/opengl/isosurf/makefile.bcc | 495 +- samples/opengl/isosurf/makefile.gcc | 483 +- samples/opengl/isosurf/makefile.vc | 703 +- samples/opengl/isosurf/makefile.wat | 552 +- samples/opengl/makefile.bcc | 167 +- samples/opengl/makefile.gcc | 127 +- samples/opengl/makefile.unx | 2 +- samples/opengl/makefile.vc | 137 +- samples/opengl/makefile.wat | 177 +- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/penguin/makefile.bcc | 524 +- samples/opengl/penguin/makefile.gcc | 512 +- samples/opengl/penguin/makefile.vc | 734 +- samples/opengl/penguin/makefile.wat | 581 +- samples/opengl/penguin/penguin_vc7.vcproj | 16 +- samples/opengl/penguin/penguin_vc8.vcproj | 16 +- samples/opengl/penguin/penguin_vc9.vcproj | 16 +- samples/ownerdrw/Makefile.in | 2 +- samples/ownerdrw/makefile.bcc | 485 +- samples/ownerdrw/makefile.gcc | 473 +- samples/ownerdrw/makefile.vc | 693 +- samples/ownerdrw/makefile.wat | 540 +- samples/ownerdrw/ownerdrw_vc7.vcproj | 16 +- samples/ownerdrw/ownerdrw_vc8.vcproj | 16 +- samples/ownerdrw/ownerdrw_vc9.vcproj | 16 +- samples/popup/Makefile.in | 2 +- samples/popup/makefile.bcc | 477 +- samples/popup/makefile.gcc | 465 +- samples/popup/makefile.vc | 685 +- samples/popup/makefile.wat | 532 +- samples/popup/popup_vc7.vcproj | 16 +- samples/popup/popup_vc8.vcproj | 16 +- samples/popup/popup_vc9.vcproj | 16 +- samples/power/Makefile.in | 2 +- samples/power/makefile.bcc | 477 +- samples/power/makefile.gcc | 465 +- samples/power/makefile.vc | 685 +- samples/power/makefile.wat | 532 +- samples/power/power_vc7.vcproj | 16 +- samples/power/power_vc8.vcproj | 16 +- samples/power/power_vc9.vcproj | 16 +- samples/printing/Makefile.in | 2 +- samples/printing/makefile.bcc | 477 +- samples/printing/makefile.gcc | 465 +- samples/printing/makefile.vc | 685 +- samples/printing/makefile.wat | 532 +- samples/printing/printing_vc7.vcproj | 16 +- samples/printing/printing_vc8.vcproj | 16 +- samples/printing/printing_vc9.vcproj | 16 +- samples/propgrid/Makefile.in | 2 +- samples/propgrid/makefile.bcc | 517 +- samples/propgrid/makefile.gcc | 505 +- samples/propgrid/makefile.vc | 725 +- samples/propgrid/makefile.wat | 576 +- samples/propgrid/propgrid_vc7.vcproj | 16 +- samples/propgrid/propgrid_vc8.vcproj | 16 +- samples/propgrid/propgrid_vc9.vcproj | 16 +- samples/regtest/Makefile.in | 2 +- samples/regtest/makefile.bcc | 477 +- samples/regtest/makefile.gcc | 465 +- samples/regtest/makefile.vc | 685 +- samples/regtest/makefile.wat | 532 +- samples/regtest/regtest_vc7.vcproj | 16 +- samples/regtest/regtest_vc8.vcproj | 16 +- samples/regtest/regtest_vc9.vcproj | 16 +- samples/render/Makefile.in | 2 +- samples/render/makefile.bcc | 535 +- samples/render/makefile.gcc | 510 +- samples/render/makefile.vc | 777 +- samples/render/makefile.wat | 597 +- samples/render/render_vc7_renddll.vcproj | 8 +- samples/render/render_vc7_render.vcproj | 16 +- samples/render/render_vc8_renddll.vcproj | 8 +- samples/render/render_vc8_render.vcproj | 16 +- samples/render/render_vc9_renddll.vcproj | 8 +- samples/render/render_vc9_render.vcproj | 16 +- samples/ribbon/Makefile.in | 2 +- samples/ribbon/makefile.bcc | 493 +- samples/ribbon/makefile.gcc | 481 +- samples/ribbon/makefile.vc | 701 +- samples/ribbon/makefile.wat | 552 +- samples/ribbon/ribbon_vc7.vcproj | 16 +- samples/ribbon/ribbon_vc8.vcproj | 16 +- samples/ribbon/ribbon_vc9.vcproj | 16 +- samples/richtext/Makefile.in | 2 +- samples/richtext/makefile.bcc | 509 +- samples/richtext/makefile.gcc | 497 +- samples/richtext/makefile.vc | 717 +- samples/richtext/makefile.wat | 572 +- samples/richtext/richtext_vc7.vcproj | 16 +- samples/richtext/richtext_vc8.vcproj | 16 +- samples/richtext/richtext_vc9.vcproj | 16 +- samples/sashtest/Makefile.in | 2 +- samples/sashtest/makefile.bcc | 485 +- samples/sashtest/makefile.gcc | 473 +- samples/sashtest/makefile.vc | 693 +- samples/sashtest/makefile.wat | 542 +- samples/sashtest/sashtest_vc7.vcproj | 16 +- samples/sashtest/sashtest_vc8.vcproj | 16 +- samples/sashtest/sashtest_vc9.vcproj | 16 +- samples/scroll/Makefile.in | 2 +- samples/scroll/makefile.bcc | 477 +- samples/scroll/makefile.gcc | 465 +- samples/scroll/makefile.vc | 685 +- samples/scroll/makefile.wat | 532 +- samples/scroll/scroll_vc7.vcproj | 16 +- samples/scroll/scroll_vc8.vcproj | 16 +- samples/scroll/scroll_vc9.vcproj | 16 +- samples/shaped/Makefile.in | 2 +- samples/shaped/makefile.bcc | 485 +- samples/shaped/makefile.gcc | 473 +- samples/shaped/makefile.vc | 693 +- samples/shaped/makefile.wat | 540 +- samples/shaped/shaped_vc7.vcproj | 16 +- samples/shaped/shaped_vc8.vcproj | 16 +- samples/shaped/shaped_vc9.vcproj | 16 +- samples/sockets/Makefile.in | 2 +- samples/sockets/makefile.bcc | 646 +- samples/sockets/makefile.gcc | 598 +- samples/sockets/makefile.vc | 956 +- samples/sockets/makefile.wat | 720 +- samples/sockets/sockets_vc7_baseclient.vcproj | 16 +- samples/sockets/sockets_vc7_baseserver.vcproj | 16 +- samples/sockets/sockets_vc7_client.vcproj | 16 +- samples/sockets/sockets_vc7_server.vcproj | 16 +- samples/sockets/sockets_vc8_baseclient.vcproj | 16 +- samples/sockets/sockets_vc8_baseserver.vcproj | 16 +- samples/sockets/sockets_vc8_client.vcproj | 16 +- samples/sockets/sockets_vc8_server.vcproj | 16 +- samples/sockets/sockets_vc9_baseclient.vcproj | 16 +- samples/sockets/sockets_vc9_baseserver.vcproj | 16 +- samples/sockets/sockets_vc9_client.vcproj | 16 +- samples/sockets/sockets_vc9_server.vcproj | 16 +- samples/sound/Makefile.in | 2 +- samples/sound/makefile.bcc | 493 +- samples/sound/makefile.gcc | 481 +- samples/sound/makefile.vc | 701 +- samples/sound/makefile.wat | 550 +- samples/sound/sound_vc7.vcproj | 16 +- samples/sound/sound_vc8.vcproj | 16 +- samples/sound/sound_vc9.vcproj | 16 +- samples/splash/Makefile.in | 2 +- samples/splash/makefile.bcc | 501 +- samples/splash/makefile.gcc | 493 +- samples/splash/makefile.vc | 709 +- samples/splash/makefile.wat | 564 +- samples/splash/splash_vc7.vcproj | 16 +- samples/splash/splash_vc8.vcproj | 16 +- samples/splash/splash_vc9.vcproj | 16 +- samples/splitter/Makefile.in | 2 +- samples/splitter/makefile.bcc | 477 +- samples/splitter/makefile.gcc | 465 +- samples/splitter/makefile.vc | 685 +- samples/splitter/makefile.wat | 532 +- samples/splitter/splitter_vc7.vcproj | 16 +- samples/splitter/splitter_vc8.vcproj | 16 +- samples/splitter/splitter_vc9.vcproj | 16 +- samples/statbar/Makefile.in | 2 +- samples/statbar/makefile.bcc | 477 +- samples/statbar/makefile.gcc | 465 +- samples/statbar/makefile.vc | 685 +- samples/statbar/makefile.wat | 532 +- samples/statbar/statbar_vc7.vcproj | 16 +- samples/statbar/statbar_vc8.vcproj | 16 +- samples/statbar/statbar_vc9.vcproj | 16 +- samples/stc/Makefile.in | 2 +- samples/stc/makefile.bcc | 509 +- samples/stc/makefile.gcc | 497 +- samples/stc/makefile.vc | 717 +- samples/stc/makefile.wat | 566 +- samples/stc/stctest_vc7.vcproj | 16 +- samples/stc/stctest_vc8.vcproj | 16 +- samples/stc/stctest_vc9.vcproj | 16 +- samples/svg/Makefile.in | 2 +- samples/svg/makefile.bcc | 477 +- samples/svg/makefile.gcc | 465 +- samples/svg/makefile.vc | 685 +- samples/svg/makefile.wat | 532 +- samples/svg/svgtest_vc7.vcproj | 16 +- samples/svg/svgtest_vc8.vcproj | 16 +- samples/svg/svgtest_vc9.vcproj | 16 +- samples/taborder/Makefile.in | 2 +- samples/taborder/makefile.bcc | 477 +- samples/taborder/makefile.gcc | 465 +- samples/taborder/makefile.vc | 685 +- samples/taborder/makefile.wat | 532 +- samples/taborder/taborder_vc7.vcproj | 16 +- samples/taborder/taborder_vc8.vcproj | 16 +- samples/taborder/taborder_vc9.vcproj | 16 +- samples/taskbar/Makefile.in | 2 +- samples/taskbar/makefile.bcc | 485 +- samples/taskbar/makefile.gcc | 473 +- samples/taskbar/makefile.vc | 693 +- samples/taskbar/makefile.wat | 542 +- samples/taskbar/taskbar_vc7.vcproj | 16 +- samples/taskbar/taskbar_vc8.vcproj | 16 +- samples/taskbar/taskbar_vc9.vcproj | 16 +- samples/text/Makefile.in | 2 +- samples/text/makefile.bcc | 477 +- samples/text/makefile.gcc | 464 +- samples/text/makefile.vc | 685 +- samples/text/makefile.wat | 532 +- samples/text/text_vc7.vcproj | 16 +- samples/text/text_vc8.vcproj | 16 +- samples/text/text_vc9.vcproj | 16 +- samples/thread/Makefile.in | 2 +- samples/thread/makefile.bcc | 477 +- samples/thread/makefile.gcc | 465 +- samples/thread/makefile.vc | 685 +- samples/thread/makefile.wat | 532 +- samples/thread/thread_vc7.vcproj | 16 +- samples/thread/thread_vc8.vcproj | 16 +- samples/thread/thread_vc9.vcproj | 16 +- samples/toolbar/Makefile.in | 2 +- samples/toolbar/makefile.bcc | 477 +- samples/toolbar/makefile.gcc | 465 +- samples/toolbar/makefile.vc | 685 +- samples/toolbar/makefile.wat | 532 +- samples/toolbar/toolbar_vc7.vcproj | 16 +- samples/toolbar/toolbar_vc8.vcproj | 16 +- samples/toolbar/toolbar_vc9.vcproj | 16 +- samples/treectrl/Makefile.in | 2 +- samples/treectrl/makefile.bcc | 477 +- samples/treectrl/makefile.gcc | 465 +- samples/treectrl/makefile.vc | 685 +- samples/treectrl/makefile.wat | 532 +- samples/treectrl/treectrl_vc7.vcproj | 16 +- samples/treectrl/treectrl_vc8.vcproj | 16 +- samples/treectrl/treectrl_vc9.vcproj | 16 +- samples/typetest/Makefile.in | 2 +- samples/typetest/makefile.bcc | 477 +- samples/typetest/makefile.gcc | 465 +- samples/typetest/makefile.vc | 685 +- samples/typetest/makefile.wat | 532 +- samples/typetest/typetest_vc7.vcproj | 16 +- samples/typetest/typetest_vc8.vcproj | 16 +- samples/typetest/typetest_vc9.vcproj | 16 +- samples/validate/Makefile.in | 2 +- samples/validate/makefile.bcc | 477 +- samples/validate/makefile.gcc | 465 +- samples/validate/makefile.vc | 685 +- samples/validate/makefile.wat | 532 +- samples/validate/validate_vc7.vcproj | 16 +- samples/validate/validate_vc8.vcproj | 16 +- samples/validate/validate_vc9.vcproj | 16 +- samples/vscroll/Makefile.in | 2 +- samples/vscroll/makefile.bcc | 477 +- samples/vscroll/makefile.gcc | 465 +- samples/vscroll/makefile.vc | 685 +- samples/vscroll/makefile.wat | 532 +- samples/vscroll/vscroll_vc7.vcproj | 16 +- samples/vscroll/vscroll_vc8.vcproj | 16 +- samples/vscroll/vscroll_vc9.vcproj | 16 +- samples/widgets/Makefile.in | 2 +- samples/widgets/makefile.bcc | 701 +- samples/widgets/makefile.gcc | 689 +- samples/widgets/makefile.vc | 909 +- samples/widgets/makefile.wat | 758 +- samples/widgets/widgets_vc7.vcproj | 16 +- samples/widgets/widgets_vc8.vcproj | 16 +- samples/widgets/widgets_vc9.vcproj | 16 +- samples/wizard/Makefile.in | 2 +- samples/wizard/makefile.bcc | 485 +- samples/wizard/makefile.gcc | 473 +- samples/wizard/makefile.vc | 693 +- samples/wizard/makefile.wat | 542 +- samples/wizard/wizard_vc7.vcproj | 16 +- samples/wizard/wizard_vc8.vcproj | 16 +- samples/wizard/wizard_vc9.vcproj | 16 +- samples/wrapsizer/Makefile.in | 2 +- samples/wrapsizer/makefile.bcc | 477 +- samples/wrapsizer/makefile.gcc | 465 +- samples/wrapsizer/makefile.vc | 685 +- samples/wrapsizer/makefile.wat | 532 +- samples/wrapsizer/wrapsizer_vc7.vcproj | 16 +- samples/wrapsizer/wrapsizer_vc8.vcproj | 16 +- samples/wrapsizer/wrapsizer_vc9.vcproj | 16 +- samples/xrc/Makefile.in | 2 +- samples/xrc/makefile.bcc | 541 +- samples/xrc/makefile.gcc | 529 +- samples/xrc/makefile.vc | 749 +- samples/xrc/makefile.wat | 604 +- samples/xrc/xrcdemo_vc7.vcproj | 16 +- samples/xrc/xrcdemo_vc8.vcproj | 16 +- samples/xrc/xrcdemo_vc9.vcproj | 16 +- tests/benchmarks/bench_vc7.vcproj | 16 +- tests/benchmarks/bench_vc8.vcproj | 16 +- tests/benchmarks/bench_vc9.vcproj | 16 +- tests/benchmarks/makefile.bcc | 18 +- tests/benchmarks/makefile.gcc | 18 +- tests/benchmarks/makefile.vc | 18 +- tests/benchmarks/makefile.wat | 21 +- tests/makefile.bcc | 35 +- tests/makefile.gcc | 29 +- tests/makefile.vc | 37 +- tests/makefile.wat | 36 +- tests/test_vc7_test.vcproj | 16 +- tests/test_vc7_test_gui.vcproj | 16 +- tests/test_vc8_test.vcproj | 16 +- tests/test_vc8_test_gui.vcproj | 16 +- tests/test_vc9_test.vcproj | 16 +- tests/test_vc9_test_gui.vcproj | 16 +- utils/Makefile.in | 2 +- utils/emulator/src/Makefile.in | 2 +- utils/emulator/src/emulator_vc7.vcproj | 16 +- utils/emulator/src/emulator_vc8.vcproj | 16 +- utils/emulator/src/emulator_vc9.vcproj | 16 +- utils/emulator/src/makefile.bcc | 485 +- utils/emulator/src/makefile.gcc | 473 +- utils/emulator/src/makefile.vc | 693 +- utils/emulator/src/makefile.wat | 540 +- utils/execmon/Makefile.in | 2 +- utils/execmon/execmon_vc7.vcproj | 16 +- utils/execmon/execmon_vc8.vcproj | 16 +- utils/execmon/execmon_vc9.vcproj | 16 +- utils/execmon/makefile.bcc | 392 +- utils/execmon/makefile.gcc | 378 +- utils/execmon/makefile.vc | 560 +- utils/execmon/makefile.wat | 503 +- utils/helpview/src/Makefile.in | 2 +- utils/helpview/src/helpview_vc7.vcproj | 16 +- utils/helpview/src/helpview_vc8.vcproj | 16 +- utils/helpview/src/helpview_vc9.vcproj | 16 +- utils/helpview/src/makefile.bcc | 501 +- utils/helpview/src/makefile.gcc | 489 +- utils/helpview/src/makefile.vc | 709 +- utils/helpview/src/makefile.wat | 560 +- utils/hhp2cached/Makefile.in | 2 +- utils/hhp2cached/hhp2cached_vc7.vcproj | 16 +- utils/hhp2cached/hhp2cached_vc8.vcproj | 16 +- utils/hhp2cached/hhp2cached_vc9.vcproj | 16 +- utils/hhp2cached/makefile.bcc | 485 +- utils/hhp2cached/makefile.gcc | 473 +- utils/hhp2cached/makefile.vc | 693 +- utils/hhp2cached/makefile.wat | 542 +- utils/ifacecheck/src/Makefile.in | 2 +- utils/ifacecheck/src/ifacecheck_vc7.vcproj | 16 +- utils/ifacecheck/src/ifacecheck_vc8.vcproj | 16 +- utils/ifacecheck/src/ifacecheck_vc9.vcproj | 16 +- utils/ifacecheck/src/makefile.bcc | 398 +- utils/ifacecheck/src/makefile.gcc | 384 +- utils/ifacecheck/src/makefile.vc | 566 +- utils/ifacecheck/src/makefile.wat | 510 +- utils/makefile.bcc | 247 +- utils/makefile.gcc | 161 +- utils/makefile.vc | 201 +- utils/makefile.wat | 241 +- utils/screenshotgen/src/Makefile.in | 2 +- utils/screenshotgen/src/makefile.bcc | 565 +- utils/screenshotgen/src/makefile.gcc | 553 +- utils/screenshotgen/src/makefile.vc | 773 +- utils/screenshotgen/src/makefile.wat | 630 +- .../src/screenshotgen_vc7.vcproj | 16 +- .../src/screenshotgen_vc8.vcproj | 16 +- .../src/screenshotgen_vc9.vcproj | 16 +- utils/wxrc/Makefile.in | 2 +- utils/wxrc/makefile.bcc | 400 +- utils/wxrc/makefile.gcc | 385 +- utils/wxrc/makefile.vc | 568 +- utils/wxrc/makefile.wat | 513 +- utils/wxrc/wxrc_vc7.vcproj | 16 +- utils/wxrc/wxrc_vc8.vcproj | 16 +- utils/wxrc/wxrc_vc9.vcproj | 16 +- version-script.in | 1 + 927 files changed, 174339 insertions(+), 168806 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6d634b5985..c513f1343d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4261,6 +4261,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ monodll_fontutilcmn.o \ @@ -4454,6 +4455,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fontpickercmn.o \ monodll_fldlgcmn.o \ monodll_fontcmn.o \ + monodll_graphicc.o \ monodll_fontenumcmn.o \ monodll_fontmap.o \ monodll_fontutilcmn.o \ @@ -4991,7 +4993,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ monodll_generic_fdrepdlg.o \ monodll_filepickerg.o \ - monodll_graphicc.o \ monodll_generic_listctrl.o \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ @@ -6080,6 +6081,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ monolib_fontutilcmn.o \ @@ -6273,6 +6275,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fontpickercmn.o \ monolib_fldlgcmn.o \ monolib_fontcmn.o \ + monolib_graphicc.o \ monolib_fontenumcmn.o \ monolib_fontmap.o \ monolib_fontutilcmn.o \ @@ -6810,7 +6813,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ monolib_generic_fdrepdlg.o \ monolib_filepickerg.o \ - monolib_graphicc.o \ monolib_generic_listctrl.o \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ @@ -8088,6 +8090,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ coredll_fontutilcmn.o \ @@ -8281,6 +8284,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fontpickercmn.o \ coredll_fldlgcmn.o \ coredll_fontcmn.o \ + coredll_graphicc.o \ coredll_fontenumcmn.o \ coredll_fontmap.o \ coredll_fontutilcmn.o \ @@ -8818,7 +8822,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ coredll_generic_fdrepdlg.o \ coredll_filepickerg.o \ - coredll_graphicc.o \ coredll_generic_listctrl.o \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ @@ -9580,6 +9583,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ corelib_fontutilcmn.o \ @@ -9773,6 +9777,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fontpickercmn.o \ corelib_fldlgcmn.o \ corelib_fontcmn.o \ + corelib_graphicc.o \ corelib_fontenumcmn.o \ corelib_fontmap.o \ corelib_fontutilcmn.o \ @@ -10310,7 +10315,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ corelib_generic_fdrepdlg.o \ corelib_filepickerg.o \ - corelib_graphicc.o \ corelib_generic_listctrl.o \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ @@ -15023,9 +15027,6 @@ monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -18764,6 +18765,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -19823,9 +19827,6 @@ monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -23564,6 +23565,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -25334,9 +25338,6 @@ coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP) coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -28547,6 +28548,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp @@ -28865,9 +28869,6 @@ corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP) corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm -corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp - corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -32078,6 +32079,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp +@COND_USE_GUI_1@corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + @COND_USE_GUI_1@corelib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index b48f9c0d8b..91866a8868 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -866,6 +866,12 @@ dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/fo COND_UNICODE_1="" fi AC_SUBST(COND_UNICODE_1) +dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/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/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.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/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### + COND_USE_CAIRO_1="#" + if test "x$USE_CAIRO" = "x1" ; then + COND_USE_CAIRO_1="" + fi + AC_SUBST(COND_USE_CAIRO_1) dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/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/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/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/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/wxrc/wxrc.bkl,wx.bkl] ### COND_USE_EXCEPTIONS_0="#" if test "x$USE_EXCEPTIONS" = "x0" ; then diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index ab78d55f42..3711f526ef 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -287,7 +287,15 @@ unicows - + + cairo + + + $(DOLLAR)(CAIRO_ROOT)/lib + + + $(DOLLAR)(CAIRO_ROOT)/include/cairo + gdiplus @@ -486,6 +494,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(GFXCTX_DEFINE) $(SETUPHDIR) $(TOP_SRCDIR)include + $(CAIRO_INCLUDEDIR) $(LIBDIRNAME) $(MGLLIBPATH) @@ -532,6 +541,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(UNICOWS_LIB) $(GDIPLUS_LIB) + $(CAIRO_LIB) + $(CAIRO_LIBDIR) ole2w32 diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index 8c595ead8b..c6eec433a2 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -301,6 +301,14 @@ Default is to use debug CRT if and only if BUILD==debug. + +