From 95ff11c4bb0b4a58f86f096871489b5723e2102c Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Fri, 24 Apr 2009 10:36:24 +0000 Subject: [PATCH] update bakefile to 0.2.6 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 67 +- autoconf_inc.m4 | 4 +- build/msw/config.bcc | 2 +- build/msw/config.gcc | 2 +- build/msw/config.vc | 2 +- build/msw/config.wat | 2 +- build/msw/makefile.bcc | 2 +- build/msw/makefile.gcc | 2 +- build/msw/makefile.vc | 2 +- build/msw/makefile.wat | 6 +- build/msw/wx_vc7.sln | 602 +-- build/msw/wx_vc7_adv.vcproj | 600 +-- build/msw/wx_vc7_aui.vcproj | 564 +-- build/msw/wx_vc7_base.vcproj | 584 +-- build/msw/wx_vc7_core.vcproj | 2918 +++++++++++---- build/msw/wx_vc7_gl.vcproj | 564 +-- build/msw/wx_vc7_html.vcproj | 564 +-- build/msw/wx_vc7_media.vcproj | 564 +-- build/msw/wx_vc7_net.vcproj | 564 +-- build/msw/wx_vc7_propgrid.vcproj | 564 +-- build/msw/wx_vc7_qa.vcproj | 564 +-- build/msw/wx_vc7_richtext.vcproj | 564 +-- build/msw/wx_vc7_stc.vcproj | 564 +-- build/msw/wx_vc7_wxexpat.vcproj | 254 +- build/msw/wx_vc7_wxjpeg.vcproj | 254 +- build/msw/wx_vc7_wxpng.vcproj | 228 +- build/msw/wx_vc7_wxregex.vcproj | 426 +-- build/msw/wx_vc7_wxscintilla.vcproj | 228 +- build/msw/wx_vc7_wxtiff.vcproj | 228 +- build/msw/wx_vc7_wxzlib.vcproj | 228 +- build/msw/wx_vc7_xml.vcproj | 564 +-- build/msw/wx_vc7_xrc.vcproj | 564 +-- build/msw/wx_vc8.sln | 602 +-- build/msw/wx_vc8_adv.vcproj | 616 +-- build/msw/wx_vc8_aui.vcproj | 622 ++-- build/msw/wx_vc8_base.vcproj | 598 +-- build/msw/wx_vc8_core.vcproj | 3290 +++++++++++++---- build/msw/wx_vc8_gl.vcproj | 622 ++-- build/msw/wx_vc8_html.vcproj | 580 +-- build/msw/wx_vc8_media.vcproj | 622 ++-- build/msw/wx_vc8_net.vcproj | 622 ++-- build/msw/wx_vc8_propgrid.vcproj | 622 ++-- build/msw/wx_vc8_qa.vcproj | 622 ++-- build/msw/wx_vc8_richtext.vcproj | 622 ++-- build/msw/wx_vc8_stc.vcproj | 622 ++-- build/msw/wx_vc8_wxexpat.vcproj | 260 +- build/msw/wx_vc8_wxjpeg.vcproj | 260 +- build/msw/wx_vc8_wxpng.vcproj | 228 +- build/msw/wx_vc8_wxregex.vcproj | 436 +-- build/msw/wx_vc8_wxscintilla.vcproj | 228 +- build/msw/wx_vc8_wxtiff.vcproj | 228 +- build/msw/wx_vc8_wxzlib.vcproj | 228 +- build/msw/wx_vc8_xml.vcproj | 622 ++-- build/msw/wx_vc8_xrc.vcproj | 622 ++-- build/msw/wx_vc9.sln | 602 +-- build/msw/wx_vc9_adv.vcproj | 608 +-- build/msw/wx_vc9_aui.vcproj | 616 +-- build/msw/wx_vc9_base.vcproj | 592 +-- build/msw/wx_vc9_core.vcproj | 3244 ++++++++++++---- build/msw/wx_vc9_gl.vcproj | 616 +-- build/msw/wx_vc9_html.vcproj | 574 +-- build/msw/wx_vc9_media.vcproj | 616 +-- build/msw/wx_vc9_net.vcproj | 616 +-- build/msw/wx_vc9_propgrid.vcproj | 616 +-- build/msw/wx_vc9_qa.vcproj | 616 +-- build/msw/wx_vc9_richtext.vcproj | 616 +-- build/msw/wx_vc9_stc.vcproj | 616 +-- build/msw/wx_vc9_wxexpat.vcproj | 252 +- build/msw/wx_vc9_wxjpeg.vcproj | 252 +- build/msw/wx_vc9_wxpng.vcproj | 220 +- build/msw/wx_vc9_wxregex.vcproj | 428 +-- build/msw/wx_vc9_wxscintilla.vcproj | 220 +- build/msw/wx_vc9_wxtiff.vcproj | 220 +- build/msw/wx_vc9_wxzlib.vcproj | 220 +- build/msw/wx_vc9_xml.vcproj | 616 +-- build/msw/wx_vc9_xrc.vcproj | 616 +-- demos/Makefile.in | 2 +- demos/bombs/Makefile.in | 2 +- demos/bombs/bombs_vc7.vcproj | 308 +- demos/bombs/bombs_vc8.vcproj | 308 +- demos/bombs/bombs_vc9.sln | 42 +- demos/bombs/bombs_vc9.vcproj | 300 +- demos/bombs/makefile.bcc | 2 +- demos/bombs/makefile.gcc | 2 +- demos/bombs/makefile.vc | 2 +- demos/bombs/makefile.wat | 6 +- demos/forty/Makefile.in | 2 +- demos/forty/forty_vc7.vcproj | 308 +- demos/forty/forty_vc8.vcproj | 308 +- demos/forty/forty_vc9.sln | 42 +- demos/forty/forty_vc9.vcproj | 300 +- demos/forty/makefile.bcc | 2 +- demos/forty/makefile.gcc | 2 +- demos/forty/makefile.vc | 2 +- demos/forty/makefile.wat | 6 +- demos/fractal/Makefile.in | 2 +- demos/fractal/fractal_vc7.vcproj | 308 +- demos/fractal/fractal_vc8.vcproj | 308 +- demos/fractal/fractal_vc9.sln | 42 +- demos/fractal/fractal_vc9.vcproj | 300 +- demos/fractal/makefile.bcc | 2 +- demos/fractal/makefile.gcc | 2 +- demos/fractal/makefile.vc | 2 +- demos/fractal/makefile.wat | 6 +- demos/life/Makefile.in | 2 +- demos/life/life_vc7.vcproj | 308 +- demos/life/life_vc8.vcproj | 308 +- demos/life/life_vc9.sln | 42 +- demos/life/life_vc9.vcproj | 300 +- demos/life/makefile.bcc | 2 +- demos/life/makefile.gcc | 2 +- demos/life/makefile.vc | 2 +- demos/life/makefile.wat | 6 +- demos/makefile.bcc | 2 +- demos/makefile.gcc | 2 +- demos/makefile.vc | 2 +- demos/makefile.wat | 6 +- demos/poem/Makefile.in | 2 +- demos/poem/makefile.bcc | 2 +- demos/poem/makefile.gcc | 2 +- demos/poem/makefile.vc | 2 +- demos/poem/makefile.wat | 6 +- demos/poem/poem_vc7.vcproj | 308 +- demos/poem/poem_vc8.vcproj | 308 +- demos/poem/poem_vc9.sln | 42 +- demos/poem/poem_vc9.vcproj | 300 +- samples/access/Makefile.in | 2 +- samples/access/access_vc7.vcproj | 308 +- samples/access/access_vc8.vcproj | 308 +- samples/access/access_vc9.vcproj | 300 +- samples/access/makefile.bcc | 2 +- samples/access/makefile.gcc | 2 +- samples/access/makefile.unx | 4 +- samples/access/makefile.vc | 2 +- samples/access/makefile.wat | 6 +- samples/animate/Makefile.in | 2 +- samples/animate/anitest_vc7.vcproj | 310 +- samples/animate/anitest_vc8.vcproj | 310 +- samples/animate/anitest_vc9.vcproj | 302 +- samples/animate/makefile.bcc | 2 +- samples/animate/makefile.gcc | 2 +- samples/animate/makefile.unx | 4 +- samples/animate/makefile.vc | 2 +- samples/animate/makefile.wat | 6 +- samples/artprov/Makefile.in | 2 +- samples/artprov/artprov_vc7.vcproj | 308 +- samples/artprov/artprov_vc8.vcproj | 308 +- samples/artprov/artprov_vc9.vcproj | 300 +- samples/artprov/makefile.bcc | 2 +- samples/artprov/makefile.gcc | 2 +- samples/artprov/makefile.unx | 4 +- samples/artprov/makefile.vc | 2 +- samples/artprov/makefile.wat | 6 +- samples/aui/Makefile.in | 2 +- samples/aui/auidemo_vc7.vcproj | 310 +- samples/aui/auidemo_vc8.vcproj | 310 +- samples/aui/auidemo_vc9.vcproj | 302 +- samples/aui/makefile.bcc | 2 +- samples/aui/makefile.gcc | 2 +- samples/aui/makefile.unx | 4 +- samples/aui/makefile.vc | 2 +- samples/aui/makefile.wat | 6 +- samples/calendar/Makefile.in | 2 +- samples/calendar/calendar_vc7.vcproj | 308 +- samples/calendar/calendar_vc8.vcproj | 308 +- samples/calendar/calendar_vc9.vcproj | 300 +- samples/calendar/makefile.bcc | 2 +- samples/calendar/makefile.gcc | 2 +- samples/calendar/makefile.unx | 4 +- samples/calendar/makefile.vc | 2 +- samples/calendar/makefile.wat | 6 +- samples/caret/Makefile.in | 2 +- samples/caret/caret_vc7.vcproj | 308 +- samples/caret/caret_vc8.vcproj | 308 +- samples/caret/caret_vc9.vcproj | 300 +- samples/caret/makefile.bcc | 2 +- samples/caret/makefile.gcc | 2 +- samples/caret/makefile.unx | 4 +- samples/caret/makefile.vc | 2 +- samples/caret/makefile.wat | 6 +- samples/clipboard/Makefile.in | 2 +- samples/clipboard/clipboard_vc7.vcproj | 308 +- samples/clipboard/clipboard_vc8.vcproj | 308 +- samples/clipboard/clipboard_vc9.vcproj | 300 +- samples/clipboard/makefile.bcc | 2 +- samples/clipboard/makefile.gcc | 2 +- samples/clipboard/makefile.unx | 4 +- samples/clipboard/makefile.vc | 2 +- samples/clipboard/makefile.wat | 6 +- samples/collpane/Makefile.in | 2 +- samples/collpane/collpane_vc7.vcproj | 310 +- samples/collpane/collpane_vc8.vcproj | 310 +- samples/collpane/collpane_vc9.vcproj | 302 +- samples/collpane/makefile.bcc | 2 +- samples/collpane/makefile.gcc | 2 +- samples/collpane/makefile.unx | 4 +- samples/collpane/makefile.vc | 2 +- samples/collpane/makefile.wat | 6 +- samples/combo/Makefile.in | 2 +- samples/combo/combo_vc7.vcproj | 310 +- samples/combo/combo_vc8.vcproj | 310 +- samples/combo/combo_vc9.vcproj | 302 +- samples/combo/makefile.bcc | 2 +- samples/combo/makefile.gcc | 2 +- samples/combo/makefile.unx | 4 +- samples/combo/makefile.vc | 2 +- samples/combo/makefile.wat | 6 +- samples/config/Makefile.in | 2 +- samples/config/config_vc7.vcproj | 308 +- samples/config/config_vc8.vcproj | 308 +- samples/config/config_vc9.vcproj | 300 +- samples/config/makefile.bcc | 2 +- samples/config/makefile.gcc | 2 +- samples/config/makefile.unx | 4 +- samples/config/makefile.vc | 2 +- samples/config/makefile.wat | 6 +- samples/console/Makefile.in | 2 +- samples/console/console_vc7.vcproj | 308 +- samples/console/console_vc8.vcproj | 308 +- samples/console/console_vc9.vcproj | 300 +- samples/console/makefile.bcc | 2 +- samples/console/makefile.gcc | 2 +- samples/console/makefile.unx | 4 +- samples/console/makefile.vc | 2 +- samples/console/makefile.wat | 6 +- samples/controls/Makefile.in | 2 +- samples/controls/controls_vc7.vcproj | 308 +- samples/controls/controls_vc8.vcproj | 308 +- samples/controls/controls_vc9.vcproj | 300 +- samples/controls/makefile.bcc | 2 +- samples/controls/makefile.gcc | 2 +- samples/controls/makefile.unx | 4 +- samples/controls/makefile.vc | 2 +- samples/controls/makefile.wat | 6 +- samples/dataview/Makefile.in | 2 +- samples/dataview/dataview_vc7.vcproj | 310 +- samples/dataview/dataview_vc8.vcproj | 310 +- samples/dataview/dataview_vc9.vcproj | 302 +- samples/dataview/makefile.bcc | 2 +- samples/dataview/makefile.gcc | 2 +- samples/dataview/makefile.unx | 2 +- samples/dataview/makefile.vc | 2 +- samples/dataview/makefile.wat | 6 +- samples/debugrpt/Makefile.in | 2 +- samples/debugrpt/debugrpt_vc7.vcproj | 310 +- samples/debugrpt/debugrpt_vc8.vcproj | 310 +- samples/debugrpt/debugrpt_vc9.vcproj | 302 +- samples/debugrpt/makefile.bcc | 2 +- samples/debugrpt/makefile.gcc | 2 +- samples/debugrpt/makefile.unx | 4 +- samples/debugrpt/makefile.vc | 2 +- samples/debugrpt/makefile.wat | 6 +- samples/dialogs/Makefile.in | 2 +- samples/dialogs/dialogs_vc7.vcproj | 364 +- samples/dialogs/dialogs_vc8.vcproj | 364 +- samples/dialogs/dialogs_vc9.vcproj | 356 +- samples/dialogs/makefile.bcc | 2 +- samples/dialogs/makefile.gcc | 2 +- samples/dialogs/makefile.unx | 4 +- samples/dialogs/makefile.vc | 2 +- samples/dialogs/makefile.wat | 6 +- samples/dialup/Makefile.in | 2 +- samples/dialup/dialup_vc7.vcproj | 308 +- samples/dialup/dialup_vc8.vcproj | 308 +- samples/dialup/dialup_vc9.vcproj | 300 +- samples/dialup/makefile.bcc | 2 +- samples/dialup/makefile.gcc | 2 +- samples/dialup/makefile.unx | 4 +- samples/dialup/makefile.vc | 2 +- samples/dialup/makefile.wat | 6 +- samples/display/Makefile.in | 2 +- samples/display/display_vc7.vcproj | 310 +- samples/display/display_vc8.vcproj | 310 +- samples/display/display_vc9.vcproj | 302 +- samples/display/makefile.bcc | 2 +- samples/display/makefile.gcc | 2 +- samples/display/makefile.unx | 4 +- samples/display/makefile.vc | 2 +- samples/display/makefile.wat | 6 +- samples/dnd/Makefile.in | 2 +- samples/dnd/dnd_vc7.vcproj | 308 +- samples/dnd/dnd_vc8.vcproj | 308 +- samples/dnd/dnd_vc9.vcproj | 300 +- samples/dnd/makefile.bcc | 2 +- samples/dnd/makefile.gcc | 2 +- samples/dnd/makefile.unx | 4 +- samples/dnd/makefile.vc | 2 +- samples/dnd/makefile.wat | 6 +- samples/docview/Makefile.in | 2 +- samples/docview/docview_vc7.vcproj | 308 +- samples/docview/docview_vc8.vcproj | 308 +- samples/docview/docview_vc9.vcproj | 300 +- samples/docview/makefile.bcc | 2 +- samples/docview/makefile.gcc | 2 +- samples/docview/makefile.unx | 4 +- samples/docview/makefile.vc | 2 +- samples/docview/makefile.wat | 6 +- samples/dragimag/Makefile.in | 2 +- samples/dragimag/dragimag_vc7.vcproj | 308 +- samples/dragimag/dragimag_vc8.vcproj | 308 +- samples/dragimag/dragimag_vc9.vcproj | 300 +- samples/dragimag/makefile.bcc | 2 +- samples/dragimag/makefile.gcc | 2 +- samples/dragimag/makefile.unx | 4 +- samples/dragimag/makefile.vc | 2 +- samples/dragimag/makefile.wat | 6 +- samples/drawing/Makefile.in | 2 +- samples/drawing/drawing_vc7.vcproj | 308 +- samples/drawing/drawing_vc8.vcproj | 308 +- samples/drawing/drawing_vc9.vcproj | 300 +- samples/drawing/makefile.bcc | 2 +- samples/drawing/makefile.gcc | 2 +- samples/drawing/makefile.unx | 4 +- samples/drawing/makefile.vc | 2 +- samples/drawing/makefile.wat | 6 +- samples/erase/Makefile.in | 2 +- samples/erase/erase_vc7.vcproj | 308 +- samples/erase/erase_vc8.vcproj | 308 +- samples/erase/erase_vc9.vcproj | 300 +- samples/erase/makefile.bcc | 2 +- samples/erase/makefile.gcc | 2 +- samples/erase/makefile.unx | 4 +- samples/erase/makefile.vc | 2 +- samples/erase/makefile.wat | 6 +- samples/event/Makefile.in | 2 +- samples/event/event_vc7.vcproj | 308 +- samples/event/event_vc8.vcproj | 308 +- samples/event/event_vc9.vcproj | 300 +- samples/event/makefile.bcc | 2 +- samples/event/makefile.gcc | 2 +- samples/event/makefile.unx | 4 +- samples/event/makefile.vc | 2 +- samples/event/makefile.wat | 6 +- samples/except/Makefile.in | 2 +- samples/except/except_vc7.vcproj | 310 +- samples/except/except_vc8.vcproj | 310 +- samples/except/except_vc9.vcproj | 302 +- samples/except/makefile.bcc | 2 +- samples/except/makefile.gcc | 2 +- samples/except/makefile.unx | 4 +- samples/except/makefile.vc | 2 +- samples/except/makefile.wat | 6 +- samples/exec/Makefile.in | 2 +- samples/exec/exec_vc7.vcproj | 310 +- samples/exec/exec_vc8.vcproj | 310 +- samples/exec/exec_vc9.vcproj | 302 +- samples/exec/makefile.bcc | 2 +- samples/exec/makefile.gcc | 2 +- samples/exec/makefile.unx | 4 +- samples/exec/makefile.vc | 2 +- samples/exec/makefile.wat | 6 +- samples/flash/flash_vc7.vcproj | 310 +- samples/flash/flash_vc8.vcproj | 310 +- samples/flash/flash_vc9.vcproj | 302 +- samples/flash/makefile.vc | 2 +- samples/font/Makefile.in | 2 +- samples/font/font_vc7.vcproj | 308 +- samples/font/font_vc8.vcproj | 308 +- samples/font/font_vc9.vcproj | 300 +- samples/font/makefile.bcc | 2 +- samples/font/makefile.gcc | 2 +- samples/font/makefile.unx | 4 +- samples/font/makefile.vc | 2 +- samples/font/makefile.wat | 6 +- samples/grid/Makefile.in | 2 +- samples/grid/grid_vc7.vcproj | 308 +- samples/grid/grid_vc8.vcproj | 308 +- samples/grid/grid_vc9.vcproj | 300 +- samples/grid/makefile.bcc | 2 +- samples/grid/makefile.gcc | 2 +- samples/grid/makefile.unx | 4 +- samples/grid/makefile.vc | 2 +- samples/grid/makefile.wat | 6 +- samples/help/Makefile.in | 2 +- samples/help/help_vc7.vcproj | 308 +- samples/help/help_vc8.vcproj | 308 +- samples/help/help_vc9.vcproj | 300 +- samples/help/makefile.bcc | 2 +- samples/help/makefile.gcc | 2 +- samples/help/makefile.unx | 4 +- samples/help/makefile.vc | 2 +- samples/help/makefile.wat | 6 +- samples/htlbox/Makefile.in | 2 +- samples/htlbox/htlbox_vc7.vcproj | 308 +- samples/htlbox/htlbox_vc8.vcproj | 308 +- samples/htlbox/htlbox_vc9.vcproj | 300 +- samples/htlbox/makefile.bcc | 2 +- samples/htlbox/makefile.gcc | 2 +- samples/htlbox/makefile.unx | 4 +- samples/htlbox/makefile.vc | 2 +- samples/htlbox/makefile.wat | 6 +- samples/html/Makefile.in | 2 +- samples/html/about/Makefile.in | 2 +- samples/html/about/about_vc7.vcproj | 308 +- samples/html/about/about_vc8.vcproj | 308 +- samples/html/about/about_vc9.vcproj | 300 +- samples/html/about/makefile.bcc | 2 +- samples/html/about/makefile.gcc | 2 +- samples/html/about/makefile.unx | 4 +- samples/html/about/makefile.vc | 2 +- samples/html/about/makefile.wat | 6 +- samples/html/help/Makefile.in | 2 +- samples/html/help/help_vc7.vcproj | 308 +- samples/html/help/help_vc8.vcproj | 308 +- samples/html/help/help_vc9.vcproj | 300 +- samples/html/help/makefile.bcc | 2 +- samples/html/help/makefile.gcc | 2 +- samples/html/help/makefile.unx | 4 +- samples/html/help/makefile.vc | 2 +- samples/html/help/makefile.wat | 6 +- samples/html/helpview/Makefile.in | 2 +- samples/html/helpview/helpview_vc7.vcproj | 308 +- samples/html/helpview/helpview_vc8.vcproj | 308 +- samples/html/helpview/helpview_vc9.vcproj | 300 +- samples/html/helpview/makefile.bcc | 2 +- samples/html/helpview/makefile.gcc | 2 +- samples/html/helpview/makefile.unx | 4 +- samples/html/helpview/makefile.vc | 2 +- samples/html/helpview/makefile.wat | 6 +- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/htmlctrl/makefile.unx | 4 +- samples/html/makefile.bcc | 2 +- samples/html/makefile.gcc | 2 +- samples/html/makefile.unx | 2 +- samples/html/makefile.vc | 2 +- samples/html/makefile.wat | 6 +- samples/html/printing/Makefile.in | 2 +- samples/html/printing/makefile.bcc | 2 +- samples/html/printing/makefile.gcc | 2 +- samples/html/printing/makefile.unx | 4 +- samples/html/printing/makefile.vc | 2 +- samples/html/printing/makefile.wat | 6 +- samples/html/printing/printing_vc7.vcproj | 308 +- samples/html/printing/printing_vc8.vcproj | 308 +- samples/html/printing/printing_vc9.vcproj | 300 +- samples/html/test/Makefile.in | 2 +- samples/html/test/makefile.bcc | 2 +- samples/html/test/makefile.gcc | 2 +- samples/html/test/makefile.unx | 4 +- samples/html/test/makefile.vc | 2 +- samples/html/test/makefile.wat | 6 +- samples/html/test/test_vc7.vcproj | 308 +- samples/html/test/test_vc8.vcproj | 308 +- samples/html/test/test_vc9.vcproj | 300 +- samples/html/virtual/Makefile.in | 2 +- samples/html/virtual/makefile.bcc | 2 +- samples/html/virtual/makefile.gcc | 2 +- samples/html/virtual/makefile.unx | 4 +- samples/html/virtual/makefile.vc | 2 +- samples/html/virtual/makefile.wat | 6 +- samples/html/virtual/virtual_vc7.vcproj | 308 +- samples/html/virtual/virtual_vc8.vcproj | 308 +- samples/html/virtual/virtual_vc9.vcproj | 300 +- samples/html/widget/Makefile.in | 2 +- samples/html/widget/makefile.bcc | 2 +- samples/html/widget/makefile.gcc | 2 +- samples/html/widget/makefile.unx | 4 +- samples/html/widget/makefile.vc | 2 +- samples/html/widget/makefile.wat | 6 +- samples/html/widget/widget_vc7.vcproj | 308 +- samples/html/widget/widget_vc8.vcproj | 308 +- samples/html/widget/widget_vc9.vcproj | 300 +- samples/html/zip/Makefile.in | 2 +- samples/html/zip/makefile.bcc | 2 +- samples/html/zip/makefile.gcc | 2 +- samples/html/zip/makefile.unx | 4 +- samples/html/zip/makefile.vc | 2 +- samples/html/zip/makefile.wat | 6 +- samples/html/zip/zip_vc7.vcproj | 308 +- samples/html/zip/zip_vc8.vcproj | 308 +- samples/html/zip/zip_vc9.vcproj | 300 +- samples/image/Makefile.in | 2 +- samples/image/image_vc7.vcproj | 308 +- samples/image/image_vc8.vcproj | 308 +- samples/image/image_vc9.vcproj | 300 +- samples/image/makefile.bcc | 2 +- samples/image/makefile.gcc | 2 +- samples/image/makefile.unx | 4 +- samples/image/makefile.vc | 2 +- samples/image/makefile.wat | 6 +- samples/internat/internat_vc7.vcproj | 2 +- samples/internat/internat_vc8.vcproj | 2 +- samples/internat/internat_vc9.vcproj | 2 +- samples/ipc/Makefile.in | 2 +- samples/ipc/ipc_vc7_baseipcclient.vcproj | 308 +- samples/ipc/ipc_vc7_baseipcserver.vcproj | 308 +- samples/ipc/ipc_vc7_ipcclient.vcproj | 310 +- samples/ipc/ipc_vc7_ipcserver.vcproj | 310 +- samples/ipc/ipc_vc8_baseipcclient.vcproj | 308 +- samples/ipc/ipc_vc8_baseipcserver.vcproj | 308 +- samples/ipc/ipc_vc8_ipcclient.vcproj | 310 +- samples/ipc/ipc_vc8_ipcserver.vcproj | 310 +- samples/ipc/ipc_vc9_baseipcclient.vcproj | 300 +- samples/ipc/ipc_vc9_baseipcserver.vcproj | 300 +- samples/ipc/ipc_vc9_ipcclient.vcproj | 302 +- samples/ipc/ipc_vc9_ipcserver.vcproj | 302 +- samples/ipc/makefile.bcc | 2 +- samples/ipc/makefile.gcc | 2 +- samples/ipc/makefile.unx | 10 +- samples/ipc/makefile.vc | 2 +- samples/ipc/makefile.wat | 6 +- samples/joytest/Makefile.in | 2 +- samples/joytest/joytest_vc7.vcproj | 308 +- samples/joytest/joytest_vc8.vcproj | 308 +- samples/joytest/joytest_vc9.vcproj | 300 +- samples/joytest/makefile.bcc | 2 +- samples/joytest/makefile.gcc | 2 +- samples/joytest/makefile.unx | 4 +- samples/joytest/makefile.vc | 2 +- samples/joytest/makefile.wat | 6 +- samples/keyboard/Makefile.in | 2 +- samples/keyboard/keyboard_vc7.vcproj | 308 +- samples/keyboard/keyboard_vc8.vcproj | 308 +- samples/keyboard/keyboard_vc9.vcproj | 300 +- samples/keyboard/makefile.bcc | 2 +- samples/keyboard/makefile.gcc | 2 +- samples/keyboard/makefile.unx | 4 +- samples/keyboard/makefile.vc | 2 +- samples/keyboard/makefile.wat | 6 +- samples/layout/Makefile.in | 2 +- samples/layout/layout_vc7.vcproj | 308 +- samples/layout/layout_vc8.vcproj | 308 +- samples/layout/layout_vc9.vcproj | 300 +- samples/layout/makefile.bcc | 2 +- samples/layout/makefile.gcc | 2 +- samples/layout/makefile.unx | 4 +- samples/layout/makefile.vc | 2 +- samples/layout/makefile.wat | 6 +- samples/listctrl/Makefile.in | 2 +- samples/listctrl/listctrl_vc7.vcproj | 308 +- samples/listctrl/listctrl_vc8.vcproj | 308 +- samples/listctrl/listctrl_vc9.vcproj | 300 +- samples/listctrl/makefile.bcc | 2 +- samples/listctrl/makefile.gcc | 2 +- samples/listctrl/makefile.unx | 4 +- samples/listctrl/makefile.vc | 2 +- samples/listctrl/makefile.wat | 6 +- samples/makefile.bcc | 2 +- samples/makefile.gcc | 2 +- samples/makefile.vc | 2 +- samples/makefile.wat | 6 +- samples/mdi/Makefile.in | 2 +- samples/mdi/makefile.bcc | 2 +- samples/mdi/makefile.gcc | 2 +- samples/mdi/makefile.unx | 4 +- samples/mdi/makefile.vc | 2 +- samples/mdi/makefile.wat | 6 +- samples/mdi/mdi_vc7.vcproj | 308 +- samples/mdi/mdi_vc8.vcproj | 308 +- samples/mdi/mdi_vc9.vcproj | 300 +- samples/mediaplayer/Makefile.in | 2 +- samples/mediaplayer/makefile.bcc | 2 +- samples/mediaplayer/makefile.gcc | 2 +- samples/mediaplayer/makefile.unx | 4 +- samples/mediaplayer/makefile.vc | 2 +- samples/mediaplayer/makefile.wat | 6 +- samples/mediaplayer/mediaplayer_vc7.vcproj | 310 +- samples/mediaplayer/mediaplayer_vc8.vcproj | 310 +- samples/mediaplayer/mediaplayer_vc9.vcproj | 302 +- samples/memcheck/Makefile.in | 2 +- samples/memcheck/makefile.bcc | 2 +- samples/memcheck/makefile.gcc | 2 +- samples/memcheck/makefile.unx | 4 +- samples/memcheck/makefile.vc | 2 +- samples/memcheck/makefile.wat | 6 +- samples/memcheck/memcheck_vc7.vcproj | 308 +- samples/memcheck/memcheck_vc8.vcproj | 308 +- samples/memcheck/memcheck_vc9.vcproj | 300 +- samples/menu/Makefile.in | 2 +- samples/menu/makefile.bcc | 2 +- samples/menu/makefile.gcc | 2 +- samples/menu/makefile.unx | 4 +- samples/menu/makefile.vc | 2 +- samples/menu/makefile.wat | 6 +- samples/menu/menu_vc7.vcproj | 308 +- samples/menu/menu_vc8.vcproj | 308 +- samples/menu/menu_vc9.vcproj | 300 +- samples/mfc/makefile.vc | 2 +- samples/mfc/mfc_vc7.vcproj | 308 +- samples/mfc/mfc_vc8.vcproj | 308 +- samples/mfc/mfc_vc9.vcproj | 300 +- samples/minimal/Makefile.in | 2 +- samples/minimal/makefile.bcc | 2 +- samples/minimal/makefile.gcc | 2 +- samples/minimal/makefile.unx | 4 +- samples/minimal/makefile.vc | 2 +- samples/minimal/makefile.wat | 6 +- samples/minimal/minimal_vc7.vcproj | 310 +- samples/minimal/minimal_vc8.vcproj | 310 +- samples/minimal/minimal_vc9.vcproj | 302 +- samples/nativdlg/Makefile.in | 2 +- samples/nativdlg/makefile.bcc | 2 +- samples/nativdlg/makefile.gcc | 2 +- samples/nativdlg/makefile.unx | 4 +- samples/nativdlg/makefile.vc | 2 +- samples/nativdlg/makefile.wat | 6 +- samples/nativdlg/nativdlg_vc7.vcproj | 308 +- samples/nativdlg/nativdlg_vc8.vcproj | 308 +- samples/nativdlg/nativdlg_vc9.vcproj | 300 +- samples/notebook/Makefile.in | 2 +- samples/notebook/makefile.bcc | 2 +- samples/notebook/makefile.gcc | 2 +- samples/notebook/makefile.unx | 4 +- samples/notebook/makefile.vc | 2 +- samples/notebook/makefile.wat | 6 +- samples/notebook/notebook_vc7.vcproj | 310 +- samples/notebook/notebook_vc8.vcproj | 310 +- samples/notebook/notebook_vc9.vcproj | 302 +- samples/oleauto/Makefile.in | 2 +- samples/oleauto/makefile.bcc | 2 +- samples/oleauto/makefile.gcc | 2 +- samples/oleauto/makefile.unx | 4 +- samples/oleauto/makefile.vc | 2 +- samples/oleauto/makefile.wat | 6 +- samples/oleauto/oleauto_vc7.vcproj | 308 +- samples/oleauto/oleauto_vc8.vcproj | 308 +- samples/oleauto/oleauto_vc9.vcproj | 300 +- samples/opengl/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/cube/cube.dsp | 8 + samples/opengl/cube/cube_vc7.vcproj | 316 +- samples/opengl/cube/cube_vc8.vcproj | 318 +- samples/opengl/cube/cube_vc9.vcproj | 310 +- samples/opengl/cube/makefile.bcc | 2 +- samples/opengl/cube/makefile.gcc | 2 +- samples/opengl/cube/makefile.unx | 4 +- samples/opengl/cube/makefile.vc | 2 +- samples/opengl/cube/makefile.wat | 6 +- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/isosurf/isosurf.dsp | 8 + samples/opengl/isosurf/isosurf_vc7.vcproj | 318 +- samples/opengl/isosurf/isosurf_vc8.vcproj | 320 +- samples/opengl/isosurf/isosurf_vc9.vcproj | 312 +- samples/opengl/isosurf/makefile.bcc | 2 +- samples/opengl/isosurf/makefile.gcc | 2 +- samples/opengl/isosurf/makefile.unx | 4 +- samples/opengl/isosurf/makefile.vc | 2 +- samples/opengl/isosurf/makefile.wat | 6 +- samples/opengl/makefile.bcc | 2 +- samples/opengl/makefile.gcc | 2 +- samples/opengl/makefile.unx | 2 +- samples/opengl/makefile.vc | 2 +- samples/opengl/makefile.wat | 6 +- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/penguin/makefile.bcc | 2 +- samples/opengl/penguin/makefile.gcc | 2 +- samples/opengl/penguin/makefile.unx | 4 +- samples/opengl/penguin/makefile.vc | 2 +- samples/opengl/penguin/makefile.wat | 6 +- samples/opengl/penguin/penguin.dsp | 16 + samples/opengl/penguin/penguin_vc7.vcproj | 322 +- samples/opengl/penguin/penguin_vc8.vcproj | 326 +- samples/opengl/penguin/penguin_vc9.vcproj | 318 +- samples/ownerdrw/Makefile.in | 2 +- samples/ownerdrw/makefile.bcc | 2 +- samples/ownerdrw/makefile.gcc | 2 +- samples/ownerdrw/makefile.unx | 4 +- samples/ownerdrw/makefile.vc | 2 +- samples/ownerdrw/makefile.wat | 6 +- samples/ownerdrw/ownerdrw_vc7.vcproj | 308 +- samples/ownerdrw/ownerdrw_vc8.vcproj | 308 +- samples/ownerdrw/ownerdrw_vc9.vcproj | 300 +- samples/popup/Makefile.in | 2 +- samples/popup/makefile.bcc | 2 +- samples/popup/makefile.gcc | 2 +- samples/popup/makefile.unx | 4 +- samples/popup/makefile.vc | 2 +- samples/popup/makefile.wat | 6 +- samples/popup/popup_vc7.vcproj | 310 +- samples/popup/popup_vc8.vcproj | 310 +- samples/popup/popup_vc9.vcproj | 302 +- samples/power/Makefile.in | 2 +- samples/power/makefile.bcc | 2 +- samples/power/makefile.gcc | 2 +- samples/power/makefile.unx | 4 +- samples/power/makefile.vc | 2 +- samples/power/makefile.wat | 6 +- samples/power/power_vc7.vcproj | 310 +- samples/power/power_vc8.vcproj | 310 +- samples/power/power_vc9.vcproj | 302 +- samples/printing/Makefile.in | 2 +- samples/printing/makefile.bcc | 2 +- samples/printing/makefile.gcc | 2 +- samples/printing/makefile.unx | 4 +- samples/printing/makefile.vc | 2 +- samples/printing/makefile.wat | 6 +- samples/printing/printing_vc7.vcproj | 308 +- samples/printing/printing_vc8.vcproj | 308 +- samples/printing/printing_vc9.vcproj | 300 +- samples/propgrid/Makefile.in | 2 +- samples/propgrid/makefile.bcc | 2 +- samples/propgrid/makefile.gcc | 2 +- samples/propgrid/makefile.unx | 4 +- samples/propgrid/makefile.vc | 2 +- samples/propgrid/makefile.wat | 6 +- samples/propgrid/propgrid_vc7.vcproj | 310 +- samples/propgrid/propgrid_vc8.vcproj | 310 +- samples/propgrid/propgrid_vc9.vcproj | 302 +- samples/regtest/Makefile.in | 2 +- samples/regtest/makefile.bcc | 2 +- samples/regtest/makefile.gcc | 2 +- samples/regtest/makefile.unx | 4 +- samples/regtest/makefile.vc | 2 +- samples/regtest/makefile.wat | 6 +- samples/regtest/regtest_vc7.vcproj | 308 +- samples/regtest/regtest_vc8.vcproj | 308 +- samples/regtest/regtest_vc9.vcproj | 300 +- samples/render/Makefile.in | 2 +- samples/render/makefile.bcc | 2 +- samples/render/makefile.gcc | 2 +- samples/render/makefile.unx | 6 +- samples/render/makefile.vc | 2 +- samples/render/makefile.wat | 6 +- samples/render/render_vc7_renddll.vcproj | 148 +- samples/render/render_vc7_render.vcproj | 310 +- samples/render/render_vc8_renddll.vcproj | 148 +- samples/render/render_vc8_render.vcproj | 310 +- samples/render/render_vc9_renddll.vcproj | 144 +- samples/render/render_vc9_render.vcproj | 302 +- samples/richtext/Makefile.in | 2 +- samples/richtext/makefile.bcc | 2 +- samples/richtext/makefile.gcc | 2 +- samples/richtext/makefile.unx | 4 +- samples/richtext/makefile.vc | 2 +- samples/richtext/makefile.wat | 6 +- samples/richtext/richtext_vc7.vcproj | 310 +- samples/richtext/richtext_vc8.vcproj | 310 +- samples/richtext/richtext_vc9.vcproj | 302 +- samples/sashtest/Makefile.in | 2 +- samples/sashtest/makefile.bcc | 2 +- samples/sashtest/makefile.gcc | 2 +- samples/sashtest/makefile.unx | 4 +- samples/sashtest/makefile.vc | 2 +- samples/sashtest/makefile.wat | 6 +- samples/sashtest/sashtest_vc7.vcproj | 308 +- samples/sashtest/sashtest_vc8.vcproj | 308 +- samples/sashtest/sashtest_vc9.vcproj | 300 +- samples/scroll/Makefile.in | 2 +- samples/scroll/makefile.bcc | 2 +- samples/scroll/makefile.gcc | 2 +- samples/scroll/makefile.unx | 4 +- samples/scroll/makefile.vc | 2 +- samples/scroll/makefile.wat | 6 +- samples/scroll/scroll_vc7.vcproj | 308 +- samples/scroll/scroll_vc8.vcproj | 308 +- samples/scroll/scroll_vc9.vcproj | 300 +- samples/shaped/Makefile.in | 2 +- samples/shaped/makefile.bcc | 2 +- samples/shaped/makefile.gcc | 2 +- samples/shaped/makefile.unx | 4 +- samples/shaped/makefile.vc | 2 +- samples/shaped/makefile.wat | 6 +- samples/shaped/shaped_vc7.vcproj | 308 +- samples/shaped/shaped_vc8.vcproj | 308 +- samples/shaped/shaped_vc9.vcproj | 300 +- samples/sockets/Makefile.in | 2 +- samples/sockets/makefile.bcc | 2 +- samples/sockets/makefile.gcc | 2 +- samples/sockets/makefile.unx | 10 +- samples/sockets/makefile.vc | 2 +- samples/sockets/makefile.wat | 6 +- samples/sockets/sockets_vc7_baseclient.vcproj | 308 +- samples/sockets/sockets_vc7_baseserver.vcproj | 308 +- samples/sockets/sockets_vc7_client.vcproj | 308 +- samples/sockets/sockets_vc7_server.vcproj | 308 +- samples/sockets/sockets_vc8_baseclient.vcproj | 308 +- samples/sockets/sockets_vc8_baseserver.vcproj | 308 +- samples/sockets/sockets_vc8_client.vcproj | 308 +- samples/sockets/sockets_vc8_server.vcproj | 308 +- samples/sockets/sockets_vc9_baseclient.vcproj | 300 +- samples/sockets/sockets_vc9_baseserver.vcproj | 300 +- samples/sockets/sockets_vc9_client.vcproj | 300 +- samples/sockets/sockets_vc9_server.vcproj | 300 +- samples/sound/Makefile.in | 2 +- samples/sound/makefile.bcc | 2 +- samples/sound/makefile.gcc | 2 +- samples/sound/makefile.unx | 4 +- samples/sound/makefile.vc | 2 +- samples/sound/makefile.wat | 6 +- samples/sound/sound_vc7.vcproj | 308 +- samples/sound/sound_vc8.vcproj | 308 +- samples/sound/sound_vc9.vcproj | 300 +- samples/splash/Makefile.in | 2 +- samples/splash/makefile.bcc | 2 +- samples/splash/makefile.gcc | 2 +- samples/splash/makefile.unx | 4 +- samples/splash/makefile.vc | 2 +- samples/splash/makefile.wat | 6 +- samples/splash/splash_vc7.vcproj | 310 +- samples/splash/splash_vc8.vcproj | 310 +- samples/splash/splash_vc9.vcproj | 302 +- samples/splitter/Makefile.in | 2 +- samples/splitter/makefile.bcc | 2 +- samples/splitter/makefile.gcc | 2 +- samples/splitter/makefile.unx | 4 +- samples/splitter/makefile.vc | 2 +- samples/splitter/makefile.wat | 6 +- samples/splitter/splitter_vc7.vcproj | 308 +- samples/splitter/splitter_vc8.vcproj | 308 +- samples/splitter/splitter_vc9.vcproj | 300 +- samples/statbar/Makefile.in | 2 +- samples/statbar/makefile.bcc | 2 +- samples/statbar/makefile.gcc | 2 +- samples/statbar/makefile.unx | 4 +- samples/statbar/makefile.vc | 2 +- samples/statbar/makefile.wat | 6 +- samples/statbar/statbar_vc7.vcproj | 308 +- samples/statbar/statbar_vc8.vcproj | 308 +- samples/statbar/statbar_vc9.vcproj | 300 +- samples/stc/Makefile.in | 2 +- samples/stc/makefile.bcc | 2 +- samples/stc/makefile.gcc | 2 +- samples/stc/makefile.unx | 4 +- samples/stc/makefile.vc | 2 +- samples/stc/makefile.wat | 6 +- samples/stc/stctest_vc7.vcproj | 310 +- samples/stc/stctest_vc8.vcproj | 310 +- samples/stc/stctest_vc9.vcproj | 302 +- samples/svg/Makefile.in | 2 +- samples/svg/makefile.bcc | 2 +- samples/svg/makefile.gcc | 2 +- samples/svg/makefile.unx | 4 +- samples/svg/makefile.vc | 2 +- samples/svg/makefile.wat | 6 +- samples/svg/svgtest_vc7.vcproj | 310 +- samples/svg/svgtest_vc8.vcproj | 310 +- samples/svg/svgtest_vc9.vcproj | 302 +- samples/taborder/Makefile.in | 2 +- samples/taborder/makefile.bcc | 2 +- samples/taborder/makefile.gcc | 2 +- samples/taborder/makefile.unx | 4 +- samples/taborder/makefile.vc | 2 +- samples/taborder/makefile.wat | 6 +- samples/taborder/taborder_vc7.vcproj | 310 +- samples/taborder/taborder_vc8.vcproj | 310 +- samples/taborder/taborder_vc9.vcproj | 302 +- samples/taskbar/Makefile.in | 2 +- samples/taskbar/makefile.bcc | 2 +- samples/taskbar/makefile.gcc | 2 +- samples/taskbar/makefile.unx | 4 +- samples/taskbar/makefile.vc | 2 +- samples/taskbar/makefile.wat | 6 +- samples/taskbar/taskbar_vc7.vcproj | 310 +- samples/taskbar/taskbar_vc8.vcproj | 310 +- samples/taskbar/taskbar_vc9.vcproj | 302 +- samples/text/Makefile.in | 2 +- samples/text/makefile.bcc | 2 +- samples/text/makefile.gcc | 2 +- samples/text/makefile.unx | 4 +- samples/text/makefile.vc | 2 +- samples/text/makefile.wat | 6 +- samples/text/text_vc7.vcproj | 308 +- samples/text/text_vc8.vcproj | 308 +- samples/text/text_vc9.vcproj | 300 +- samples/thread/Makefile.in | 2 +- samples/thread/makefile.bcc | 2 +- samples/thread/makefile.gcc | 2 +- samples/thread/makefile.unx | 4 +- samples/thread/makefile.vc | 2 +- samples/thread/makefile.wat | 6 +- samples/thread/thread_vc7.vcproj | 308 +- samples/thread/thread_vc8.vcproj | 308 +- samples/thread/thread_vc9.vcproj | 300 +- samples/toolbar/Makefile.in | 2 +- samples/toolbar/makefile.bcc | 2 +- samples/toolbar/makefile.gcc | 2 +- samples/toolbar/makefile.unx | 4 +- samples/toolbar/makefile.vc | 2 +- samples/toolbar/makefile.wat | 6 +- samples/toolbar/toolbar_vc7.vcproj | 308 +- samples/toolbar/toolbar_vc8.vcproj | 308 +- samples/toolbar/toolbar_vc9.vcproj | 300 +- samples/treectrl/Makefile.in | 2 +- samples/treectrl/makefile.bcc | 2 +- samples/treectrl/makefile.gcc | 2 +- samples/treectrl/makefile.unx | 4 +- samples/treectrl/makefile.vc | 2 +- samples/treectrl/makefile.wat | 6 +- samples/treectrl/treectrl_vc7.vcproj | 310 +- samples/treectrl/treectrl_vc8.vcproj | 310 +- samples/treectrl/treectrl_vc9.vcproj | 302 +- samples/typetest/Makefile.in | 2 +- samples/typetest/makefile.bcc | 2 +- samples/typetest/makefile.gcc | 2 +- samples/typetest/makefile.unx | 4 +- samples/typetest/makefile.vc | 2 +- samples/typetest/makefile.wat | 6 +- samples/typetest/typetest_vc7.vcproj | 308 +- samples/typetest/typetest_vc8.vcproj | 308 +- samples/typetest/typetest_vc9.vcproj | 300 +- samples/validate/Makefile.in | 2 +- samples/validate/makefile.bcc | 2 +- samples/validate/makefile.gcc | 2 +- samples/validate/makefile.unx | 4 +- samples/validate/makefile.vc | 2 +- samples/validate/makefile.wat | 6 +- samples/validate/validate_vc7.vcproj | 310 +- samples/validate/validate_vc8.vcproj | 310 +- samples/validate/validate_vc9.vcproj | 302 +- samples/vscroll/Makefile.in | 2 +- samples/vscroll/makefile.bcc | 2 +- samples/vscroll/makefile.gcc | 2 +- samples/vscroll/makefile.unx | 4 +- samples/vscroll/makefile.vc | 2 +- samples/vscroll/makefile.wat | 6 +- samples/vscroll/vscroll_vc7.vcproj | 310 +- samples/vscroll/vscroll_vc8.vcproj | 310 +- samples/vscroll/vscroll_vc9.vcproj | 302 +- samples/widgets/Makefile.in | 2 +- samples/widgets/makefile.bcc | 2 +- samples/widgets/makefile.gcc | 2 +- samples/widgets/makefile.unx | 4 +- samples/widgets/makefile.vc | 2 +- samples/widgets/makefile.wat | 6 +- samples/widgets/widgets_vc7.vcproj | 310 +- samples/widgets/widgets_vc8.vcproj | 310 +- samples/widgets/widgets_vc9.vcproj | 302 +- samples/wizard/Makefile.in | 2 +- samples/wizard/makefile.bcc | 2 +- samples/wizard/makefile.gcc | 2 +- samples/wizard/makefile.unx | 4 +- samples/wizard/makefile.vc | 2 +- samples/wizard/makefile.wat | 6 +- samples/wizard/wizard_vc7.vcproj | 308 +- samples/wizard/wizard_vc8.vcproj | 308 +- samples/wizard/wizard_vc9.vcproj | 300 +- samples/wrapsizer/Makefile.in | 2 +- samples/wrapsizer/makefile.bcc | 2 +- samples/wrapsizer/makefile.gcc | 2 +- samples/wrapsizer/makefile.unx | 4 +- samples/wrapsizer/makefile.vc | 2 +- samples/wrapsizer/makefile.wat | 6 +- samples/wrapsizer/wrapsizer_vc7.vcproj | 310 +- samples/wrapsizer/wrapsizer_vc8.vcproj | 310 +- samples/wrapsizer/wrapsizer_vc9.vcproj | 302 +- samples/xrc/Makefile.in | 2 +- samples/xrc/makefile.bcc | 2 +- samples/xrc/makefile.gcc | 2 +- samples/xrc/makefile.unx | 4 +- samples/xrc/makefile.vc | 2 +- samples/xrc/makefile.wat | 6 +- samples/xrc/xrcdemo_vc7.vcproj | 308 +- samples/xrc/xrcdemo_vc8.vcproj | 308 +- samples/xrc/xrcdemo_vc9.vcproj | 300 +- tests/Makefile.in | 10 +- tests/benchmarks/Makefile.in | 2 +- tests/benchmarks/bench.sln | 3 +- tests/benchmarks/bench.vcproj | 723 ++-- tests/benchmarks/makefile.bcc | 2 +- tests/benchmarks/makefile.gcc | 2 +- tests/benchmarks/makefile.vc | 2 +- tests/benchmarks/makefile.wat | 6 +- tests/makefile.bcc | 2 +- tests/makefile.gcc | 2 +- tests/makefile.vc | 2 +- tests/makefile.wat | 6 +- tests/test_vc7_printfbench.vcproj | 340 +- tests/test_vc7_test.vcproj | 340 +- tests/test_vc7_test_gui.vcproj | 342 +- tests/test_vc8_printfbench.vcproj | 340 +- tests/test_vc8_test.vcproj | 340 +- tests/test_vc8_test_gui.vcproj | 342 +- tests/test_vc9.sln | 98 +- tests/test_vc9_printfbench.vcproj | 332 +- tests/test_vc9_test.vcproj | 332 +- tests/test_vc9_test_gui.vcproj | 334 +- utils/emulator/src/Makefile.in | 2 +- utils/emulator/src/emulator_vc7.vcproj | 310 +- utils/emulator/src/emulator_vc8.vcproj | 310 +- utils/emulator/src/emulator_vc9.sln | 42 +- utils/emulator/src/emulator_vc9.vcproj | 302 +- utils/emulator/src/makefile.bcc | 2 +- utils/emulator/src/makefile.gcc | 2 +- utils/emulator/src/makefile.vc | 2 +- utils/emulator/src/makefile.wat | 6 +- utils/helpview/src/Makefile.in | 2 +- utils/helpview/src/helpview_vc7.vcproj | 308 +- utils/helpview/src/helpview_vc8.vcproj | 308 +- utils/helpview/src/helpview_vc9.sln | 42 +- utils/helpview/src/helpview_vc9.vcproj | 300 +- utils/helpview/src/makefile.bcc | 2 +- utils/helpview/src/makefile.gcc | 2 +- utils/helpview/src/makefile.vc | 2 +- utils/helpview/src/makefile.wat | 6 +- utils/hhp2cached/Makefile.in | 2 +- utils/hhp2cached/hhp2cached_vc7.vcproj | 308 +- utils/hhp2cached/hhp2cached_vc8.vcproj | 308 +- utils/hhp2cached/hhp2cached_vc9.sln | 42 +- utils/hhp2cached/hhp2cached_vc9.vcproj | 300 +- utils/hhp2cached/makefile.bcc | 2 +- utils/hhp2cached/makefile.gcc | 2 +- utils/hhp2cached/makefile.vc | 2 +- utils/hhp2cached/makefile.wat | 6 +- utils/ifacecheck/src/Makefile.in | 2 +- utils/ifacecheck/src/ifacecheck_vc7.sln | 42 +- utils/ifacecheck/src/ifacecheck_vc7.vcproj | 308 +- utils/ifacecheck/src/ifacecheck_vc8.sln | 42 +- utils/ifacecheck/src/ifacecheck_vc8.vcproj | 308 +- utils/ifacecheck/src/ifacecheck_vc9.sln | 42 +- utils/ifacecheck/src/ifacecheck_vc9.vcproj | 300 +- utils/ifacecheck/src/makefile.bcc | 2 +- utils/ifacecheck/src/makefile.gcc | 2 +- utils/ifacecheck/src/makefile.vc | 2 +- utils/ifacecheck/src/makefile.wat | 6 +- utils/screenshotgen/src/Makefile.in | 2 +- utils/screenshotgen/src/makefile.bcc | 2 +- utils/screenshotgen/src/makefile.gcc | 2 +- utils/screenshotgen/src/makefile.vc | 2 +- utils/screenshotgen/src/makefile.wat | 6 +- utils/screenshotgen/src/screenshotgen_vc7.sln | 42 +- .../src/screenshotgen_vc7.vcproj | 308 +- utils/screenshotgen/src/screenshotgen_vc8.sln | 42 +- .../src/screenshotgen_vc8.vcproj | 308 +- utils/screenshotgen/src/screenshotgen_vc9.sln | 42 +- .../src/screenshotgen_vc9.vcproj | 300 +- utils/wxrc/Makefile.in | 2 +- utils/wxrc/makefile.bcc | 2 +- utils/wxrc/makefile.gcc | 2 +- utils/wxrc/makefile.vc | 2 +- utils/wxrc/makefile.wat | 6 +- utils/wxrc/wxrc_vc7.vcproj | 308 +- utils/wxrc/wxrc_vc8.vcproj | 308 +- utils/wxrc/wxrc_vc9.sln | 42 +- utils/wxrc/wxrc_vc9.vcproj | 300 +- 1024 files changed, 75777 insertions(+), 66938 deletions(-) diff --git a/Makefile.in b/Makefile.in index e62d62561c..8959c6bf22 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -27,6 +27,7 @@ STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ +ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ @@ -3784,7 +3785,7 @@ COND_WINDOWS_IMPLIB_1___monodll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__monodll___importlib = $(COND_WINDOWS_IMPLIB_1___monodll___importlib) @COND_GCC_PCH_1@__monodll_PCH_INC = -I./.pch/wxprec_monodll -@COND_ICC_PCH_1@__monodll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__monodll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_monodll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_monodll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_monodll/wx/wxprec.h.gch @@ -5627,7 +5628,7 @@ COND_MONOLITHIC_1_SHARED_0___monolib___depname = \ @COND_MONOLITHIC_1_SHARED_0@__uninstall_monolib___depname \ @COND_MONOLITHIC_1_SHARED_0@ = uninstall_monolib @COND_GCC_PCH_1@__monolib_PCH_INC = -I./.pch/wxprec_monolib -@COND_ICC_PCH_1@__monolib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__monolib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_monolib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_monolib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_monolib/wx/wxprec.h.gch @@ -7446,7 +7447,7 @@ COND_WINDOWS_IMPLIB_1___basedll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__basedll___importlib = $(COND_WINDOWS_IMPLIB_1___basedll___importlib) @COND_GCC_PCH_1@__basedll_PCH_INC = -I./.pch/wxprec_basedll -@COND_ICC_PCH_1@__basedll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__basedll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_basedll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_basedll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_basedll/wx/wxprec.h.gch @@ -7570,7 +7571,7 @@ COND_MONOLITHIC_0_SHARED_0___baselib___depname = \ @COND_MONOLITHIC_0_SHARED_0@__uninstall_baselib___depname \ @COND_MONOLITHIC_0_SHARED_0@ = uninstall_baselib @COND_GCC_PCH_1@__baselib_PCH_INC = -I./.pch/wxprec_baselib -@COND_ICC_PCH_1@__baselib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__baselib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_baselib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_baselib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_baselib/wx/wxprec.h.gch @@ -7673,7 +7674,7 @@ COND_WINDOWS_IMPLIB_1___netdll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__netdll___importlib = $(COND_WINDOWS_IMPLIB_1___netdll___importlib) @COND_GCC_PCH_1@__netdll_PCH_INC = -I./.pch/wxprec_netdll -@COND_ICC_PCH_1@__netdll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__netdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_netdll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_netdll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_netdll/wx/wxprec.h.gch @@ -7724,7 +7725,7 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ @COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib @COND_MONOLITHIC_0_SHARED_0@__uninstall_netlib___depname = uninstall_netlib @COND_GCC_PCH_1@__netlib_PCH_INC = -I./.pch/wxprec_netlib -@COND_ICC_PCH_1@__netlib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__netlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_netlib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_netlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_netlib/wx/wxprec.h.gch @@ -7757,7 +7758,7 @@ COND_WINDOWS_IMPLIB_1___coredll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__coredll___importlib = $(COND_WINDOWS_IMPLIB_1___coredll___importlib) @COND_GCC_PCH_1@__coredll_PCH_INC = -I./.pch/wxprec_coredll -@COND_ICC_PCH_1@__coredll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__coredll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_coredll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_coredll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_coredll/wx/wxprec.h.gch @@ -9296,7 +9297,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_corelib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_corelib @COND_GCC_PCH_1@__corelib_PCH_INC = -I./.pch/wxprec_corelib -@COND_ICC_PCH_1@__corelib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__corelib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_corelib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_corelib/wx/wxprec.h.gch @@ -10815,7 +10816,7 @@ COND_WINDOWS_IMPLIB_1___advdll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__advdll___importlib = $(COND_WINDOWS_IMPLIB_1___advdll___importlib) @COND_GCC_PCH_1@__advdll_PCH_INC = -I./.pch/wxprec_advdll -@COND_ICC_PCH_1@__advdll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__advdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_advdll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_advdll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_advdll/wx/wxprec.h.gch @@ -10940,7 +10941,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_advlib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_advlib @COND_GCC_PCH_1@__advlib_PCH_INC = -I./.pch/wxprec_advlib -@COND_ICC_PCH_1@__advlib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__advlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_advlib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_advlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_advlib/wx/wxprec.h.gch @@ -11045,7 +11046,7 @@ COND_WINDOWS_IMPLIB_1___mediadll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__mediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mediadll___importlib) @COND_GCC_PCH_1@__mediadll_PCH_INC = -I./.pch/wxprec_mediadll -@COND_ICC_PCH_1@__mediadll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__mediadll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_mediadll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_mediadll/wx/wxprec.h.gch @@ -11108,7 +11109,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__uninstall_medialib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@ = uninstall_medialib @COND_GCC_PCH_1@__medialib_PCH_INC = -I./.pch/wxprec_medialib -@COND_ICC_PCH_1@__medialib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__medialib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_medialib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_medialib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_medialib/wx/wxprec.h.gch @@ -11151,7 +11152,7 @@ COND_WINDOWS_IMPLIB_1___htmldll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__htmldll___importlib = $(COND_WINDOWS_IMPLIB_1___htmldll___importlib) @COND_GCC_PCH_1@__htmldll_PCH_INC = -I./.pch/wxprec_htmldll -@COND_ICC_PCH_1@__htmldll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__htmldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_htmldll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_htmldll/wx/wxprec.h.gch @@ -11197,7 +11198,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__uninstall_htmllib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@ = uninstall_htmllib @COND_GCC_PCH_1@__htmllib_PCH_INC = -I./.pch/wxprec_htmllib -@COND_ICC_PCH_1@__htmllib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__htmllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_htmllib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_htmllib/wx/wxprec.h.gch @@ -11223,7 +11224,7 @@ COND_WINDOWS_IMPLIB_1___qadll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__qadll___importlib = $(COND_WINDOWS_IMPLIB_1___qadll___importlib) @COND_GCC_PCH_1@__qadll_PCH_INC = -I./.pch/wxprec_qadll -@COND_ICC_PCH_1@__qadll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__qadll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_qadll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_qadll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_qadll/wx/wxprec.h.gch @@ -11266,7 +11267,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__uninstall_qalib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@ = uninstall_qalib @COND_GCC_PCH_1@__qalib_PCH_INC = -I./.pch/wxprec_qalib -@COND_ICC_PCH_1@__qalib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__qalib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_qalib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_qalib/wx/wxprec.h.gch @@ -11287,7 +11288,7 @@ COND_WINDOWS_IMPLIB_1___xmldll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__xmldll___importlib = $(COND_WINDOWS_IMPLIB_1___xmldll___importlib) @COND_GCC_PCH_1@__xmldll_PCH_INC = -I./.pch/wxprec_xmldll -@COND_ICC_PCH_1@__xmldll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__xmldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_xmldll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_xmldll/wx/wxprec.h.gch @@ -11328,7 +11329,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib @COND_MONOLITHIC_0_SHARED_0@__uninstall_xmllib___depname = uninstall_xmllib @COND_GCC_PCH_1@__xmllib_PCH_INC = -I./.pch/wxprec_xmllib -@COND_ICC_PCH_1@__xmllib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__xmllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_xmllib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_xmllib/wx/wxprec.h.gch @@ -11351,7 +11352,7 @@ COND_WINDOWS_IMPLIB_1___xrcdll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___xrcdll___importlib) @COND_GCC_PCH_1@__xrcdll_PCH_INC = -I./.pch/wxprec_xrcdll -@COND_ICC_PCH_1@__xrcdll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__xrcdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_xrcdll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_xrcdll/wx/wxprec.h.gch @@ -11394,7 +11395,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__uninstall_xrclib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = uninstall_xrclib @COND_GCC_PCH_1@__xrclib_PCH_INC = -I./.pch/wxprec_xrclib -@COND_ICC_PCH_1@__xrclib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__xrclib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_xrclib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_xrclib/wx/wxprec.h.gch @@ -11417,7 +11418,7 @@ COND_WINDOWS_IMPLIB_1___auidll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__auidll___importlib = $(COND_WINDOWS_IMPLIB_1___auidll___importlib) @COND_GCC_PCH_1@__auidll_PCH_INC = -I./.pch/wxprec_auidll -@COND_ICC_PCH_1@__auidll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__auidll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_auidll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_auidll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_auidll/wx/wxprec.h.gch @@ -11460,7 +11461,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__uninstall_auilib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = uninstall_auilib @COND_GCC_PCH_1@__auilib_PCH_INC = -I./.pch/wxprec_auilib -@COND_ICC_PCH_1@__auilib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__auilib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_auilib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch @@ -11483,7 +11484,8 @@ COND_WINDOWS_IMPLIB_1___propgriddll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__propgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___propgriddll___importlib) @COND_GCC_PCH_1@__propgriddll_PCH_INC = -I./.pch/wxprec_propgriddll -@COND_ICC_PCH_1@__propgriddll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__propgriddll_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_propgriddll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_propgriddll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_propgriddll/wx/wxprec.h.gch @@ -11527,7 +11529,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1___propgridlib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@__uninstall_propgridlib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@ = uninstall_propgridlib @COND_GCC_PCH_1@__propgridlib_PCH_INC = -I./.pch/wxprec_propgridlib -@COND_ICC_PCH_1@__propgridlib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__propgridlib_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_propgridlib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_propgridlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_propgridlib/wx/wxprec.h.gch @@ -11550,7 +11553,8 @@ COND_WINDOWS_IMPLIB_1___richtextdll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__richtextdll___importlib = $(COND_WINDOWS_IMPLIB_1___richtextdll___importlib) @COND_GCC_PCH_1@__richtextdll_PCH_INC = -I./.pch/wxprec_richtextdll -@COND_ICC_PCH_1@__richtextdll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__richtextdll_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_richtextdll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_richtextdll/wx/wxprec.h.gch @@ -11594,7 +11598,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__uninstall_richtextlib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@ = uninstall_richtextlib @COND_GCC_PCH_1@__richtextlib_PCH_INC = -I./.pch/wxprec_richtextlib -@COND_ICC_PCH_1@__richtextlib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__richtextlib_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_richtextlib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch @@ -11617,7 +11622,7 @@ COND_WINDOWS_IMPLIB_1___stcdll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib) @COND_GCC_PCH_1@__stcdll_PCH_INC = -I./.pch/wxprec_stcdll -@COND_ICC_PCH_1@__stcdll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__stcdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_stcdll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_stcdll/wx/wxprec.h.gch @@ -11660,7 +11665,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \ @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__uninstall_stclib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = uninstall_stclib @COND_GCC_PCH_1@__stclib_PCH_INC = -I./.pch/wxprec_stclib -@COND_ICC_PCH_1@__stclib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__stclib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_stclib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_stclib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_stclib/wx/wxprec.h.gch @@ -11683,7 +11688,7 @@ COND_WINDOWS_IMPLIB_1___gldll___importlib = \ -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__gldll___importlib = $(COND_WINDOWS_IMPLIB_1___gldll___importlib) @COND_GCC_PCH_1@__gldll_PCH_INC = -I./.pch/wxprec_gldll -@COND_ICC_PCH_1@__gldll_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__gldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_gldll/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_gldll_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_gldll/wx/wxprec.h.gch @@ -11752,7 +11757,7 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \ @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__uninstall_gllib___depname \ @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = uninstall_gllib @COND_GCC_PCH_1@__gllib_PCH_INC = -I./.pch/wxprec_gllib -@COND_ICC_PCH_1@__gllib_PCH_INC = -use_pch \ +@COND_ICC_PCH_1@__gllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/wxprec_gllib/wx/wxprec.h.gch @COND_USE_PCH_1@_____pch_wxprec_gllib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_gllib/wx/wxprec.h.gch diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 53cdbc1f57..340f58cda2 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/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/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.5 (http://www.bakefile.org) +dnl Bakefile 0.2.6 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS diff --git a/build/msw/config.bcc b/build/msw/config.bcc index 2e33a0a731..a5b7960754 100644 --- a/build/msw/config.bcc +++ b/build/msw/config.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/config.gcc b/build/msw/config.gcc index 92f9f276ef..08935caef6 100644 --- a/build/msw/config.gcc +++ b/build/msw/config.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/config.vc b/build/msw/config.vc index e9b3b0b5f6..a71f72dffb 100644 --- a/build/msw/config.vc +++ b/build/msw/config.vc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/config.wat b/build/msw/config.wat index 19bed8f197..efbb110be3 100644 --- a/build/msw/config.wat +++ b/build/msw/config.wat @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index c04e38a74c..be9805b769 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 3e061e989f..48afcfb3cd 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 824de08515..a42c9dcc38 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index c57f656e5e..decbe7458b 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/build/msw/wx_vc7.sln b/build/msw/wx_vc7.sln index 8f7fb2f1be..75c41e3ff9 100644 --- a/build/msw/wx_vc7.sln +++ b/build/msw/wx_vc7.sln @@ -46,352 +46,352 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc7_gl.vcproj", "{ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.ActiveCfg = Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.Build.0 = Release|Win32 {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug|Win32.ActiveCfg = Debug|Win32 {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug|Win32.Build.0 = Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.ActiveCfg = Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.Build.0 = Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.ActiveCfg = Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.Build.0 = Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug|Win32.ActiveCfg = Debug|Win32 {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug|Win32.Build.0 = Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.ActiveCfg = Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.Build.0 = Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.ActiveCfg = Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.Build.0 = Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug|Win32.ActiveCfg = Debug|Win32 {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug|Win32.Build.0 = Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.ActiveCfg = Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.Build.0 = Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.ActiveCfg = Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.Build.0 = Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug|Win32.ActiveCfg = Debug|Win32 {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug|Win32.Build.0 = Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.ActiveCfg = Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.Build.0 = Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.ActiveCfg = Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.Build.0 = Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug|Win32.ActiveCfg = Debug|Win32 {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug|Win32.Build.0 = Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.ActiveCfg = Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.Build.0 = Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.ActiveCfg = Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.Build.0 = Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug|Win32.ActiveCfg = Debug|Win32 {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug|Win32.Build.0 = Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.ActiveCfg = Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.Build.0 = Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.ActiveCfg = Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.Build.0 = Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug|Win32.ActiveCfg = Debug|Win32 {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug|Win32.Build.0 = Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.ActiveCfg = Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.Build.0 = Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.ActiveCfg = Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.Build.0 = Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug|Win32.ActiveCfg = Debug|Win32 {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug|Win32.Build.0 = Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.ActiveCfg = Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.Build.0 = Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.ActiveCfg = Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.Build.0 = Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug|Win32.ActiveCfg = Debug|Win32 {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug|Win32.Build.0 = Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.ActiveCfg = Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.Build.0 = Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.ActiveCfg = Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.Build.0 = Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug|Win32.ActiveCfg = Debug|Win32 {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug|Win32.Build.0 = Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.ActiveCfg = Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.Build.0 = Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.ActiveCfg = Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.Build.0 = Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug|Win32.ActiveCfg = Debug|Win32 {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug|Win32.Build.0 = Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.ActiveCfg = Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.Build.0 = Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.ActiveCfg = Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.Build.0 = Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug|Win32.ActiveCfg = Debug|Win32 {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug|Win32.Build.0 = Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.ActiveCfg = Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.Build.0 = Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.ActiveCfg = Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.Build.0 = Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug|Win32.ActiveCfg = Debug|Win32 {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug|Win32.Build.0 = Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.ActiveCfg = Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.Build.0 = Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.ActiveCfg = Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.Build.0 = Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug|Win32.ActiveCfg = Debug|Win32 {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug|Win32.Build.0 = Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.ActiveCfg = Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.Build.0 = Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.ActiveCfg = Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.Build.0 = Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug|Win32.ActiveCfg = Debug|Win32 {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug|Win32.Build.0 = Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.ActiveCfg = Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.Build.0 = Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.ActiveCfg = Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.Build.0 = Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug|Win32.ActiveCfg = Debug|Win32 {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug|Win32.Build.0 = Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.ActiveCfg = Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.Build.0 = Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.ActiveCfg = Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.Build.0 = Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug|Win32.ActiveCfg = Debug|Win32 {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug|Win32.Build.0 = Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.Build.0 = Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.ActiveCfg = Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.Build.0 = Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32 {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.ActiveCfg = Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.Build.0 = Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.Build.0 = Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32 {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.Build.0 = Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.ActiveCfg = Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.Build.0 = Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.ActiveCfg = Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.Build.0 = Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug|Win32.ActiveCfg = Debug|Win32 {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug|Win32.Build.0 = Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.ActiveCfg = Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.Build.0 = Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.ActiveCfg = Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.Build.0 = Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug|Win32.ActiveCfg = Debug|Win32 {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug|Win32.Build.0 = Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.ActiveCfg = Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.Build.0 = Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 96675af0f2..601a62c40d 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_adv.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -595,61 +603,61 @@ @@ -753,96 +761,96 @@ - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -905,31 +904,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_aui.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_aui.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_aui.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_aui.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -574,16 +582,16 @@ @@ -593,96 +601,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -736,31 +735,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index 1ff4efc7c5..31d131773f 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29ud.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" + OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" + OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -630,49 +638,49 @@ + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -928,16 +936,16 @@ - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -1114,31 +1113,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -895,46 +903,70 @@ + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + - - + Name="DLL Debug|Win32"> + + + Name="DLL Release|Win32"> + + - + RelativePath="..\..\src\msw\checklst.cpp"> + Name="Debug|Win32"> + + + + + - - - - + Name="DLL Debug|Win32"> + + + Name="DLL Release|Win32"> + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1066,46 +1218,94 @@ + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + Name="Debug|Win32"> + + + + + + + + + + + + + + + + + + + + + + + + @@ -1853,16 +2533,16 @@ + + + + + + + + + + + + @@ -1913,16 +2617,16 @@ + + + + + + + + + + + + @@ -1973,31 +2701,31 @@ + Name="Debug|Win32"> + + + + + + + + + + + + - - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\button.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + - - - - - + Name="DLL Universal Debug|Win32"> + + + Name="DLL Universal Release|Win32"> + + - + RelativePath="..\..\src\univ\checkbox.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\checklst.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\choice.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\combobox.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\control.cpp"> - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\ctrlrend.cpp"> - - + + - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\framuniv.cpp"> - - + + - - - + Name="Universal Debug|Win32"> + + + + + + Name="DLL Universal Debug|Win32"> + + + + + - + RelativePath="..\..\src\univ\themes\gtk.cpp"> - - + + - - + + - - + + + + + + + + - - + + + + + + + + + + + + + + - - + + + + + + + + - - + + - - + + + + + + + + - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + Name="Universal Debug|Win32"> + + + Name="Universal Release|Win32"> + + + Name="DLL Universal Debug|Win32"> + + + + + + + + + + + + + + + + + @@ -2686,96 +4038,96 @@ - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -2970,31 +4313,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_gl.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_gl.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_gl.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_gl.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -580,16 +588,16 @@ @@ -599,96 +607,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -742,31 +741,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -577,16 +585,16 @@ @@ -673,96 +681,96 @@ - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -816,31 +815,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_media.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_media.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_media.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_media.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_media_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_media.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -586,16 +594,16 @@ @@ -605,96 +613,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -748,31 +747,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj index 72d7730d07..d2365f2b1e 100644 --- a/build/msw/wx_vc7_net.vcproj +++ b/build/msw/wx_vc7_net.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29ud_net.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u_net.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29u_net.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29ud_net.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_net_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_net_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -610,16 +618,16 @@ @@ -629,96 +637,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -772,31 +771,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_propgrid.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_propgrid.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_propgrid.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_propgrid.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_propgrid_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_propgrid_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_propgrid_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -574,16 +582,16 @@ @@ -593,96 +601,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -736,31 +735,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj index cf0309eaf0..a13ea7520f 100644 --- a/build/msw/wx_vc7_qa.vcproj +++ b/build/msw/wx_vc7_qa.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_qa.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_qa.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_qa.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_qa.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -577,16 +585,16 @@ @@ -603,96 +611,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -746,31 +745,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj index 90c80c70cb..f7e04ad9b6 100644 --- a/build/msw/wx_vc7_richtext.vcproj +++ b/build/msw/wx_vc7_richtext.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_richtext.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_richtext.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_richtext.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_richtext.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -574,16 +582,16 @@ @@ -593,96 +601,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -736,31 +735,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj index e6f704a192..44aa1bc552 100644 --- a/build/msw/wx_vc7_stc.vcproj +++ b/build/msw/wx_vc7_stc.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_stc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_stc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_stc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -574,16 +582,16 @@ @@ -593,96 +601,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -736,31 +735,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj index 62fb70c802..4ab0a60dfd 100644 --- a/build/msw/wx_vc7_wxexpat.vcproj +++ b/build/msw/wx_vc7_wxexpat.vcproj @@ -1,8 +1,8 @@ @@ -17,78 +17,25 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;COMPILED_FROM_DSP" + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll"/> + + + + + + + + + + + + + + + @@ -17,78 +17,25 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/> + + + + + + + + + + + + + + + @@ -17,23 +17,25 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib"/> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswunivu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswu"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivud"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE" + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/> + AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_dll\mswunivu"/> - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -526,57 +525,57 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> - - + Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/> + + + Name="Debug|Win32"/> + + - - + Name="DLL Debug|Win32"/> + + - + Name="DLL Universal Release|Win32"> + + - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj index 0953a55afe..49a99aef0d 100644 --- a/build/msw/wx_vc7_wxscintilla.vcproj +++ b/build/msw/wx_vc7_wxscintilla.vcproj @@ -1,8 +1,8 @@ @@ -17,23 +17,25 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS" + AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/> @@ -17,23 +17,25 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/> @@ -17,23 +17,25 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG" + AdditionalIncludeDirectories=""/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB" + AdditionalIncludeDirectories=""/> @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29ud_xml.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxbase29u_xml.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29u_xml.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxbase29ud_xml.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_xml_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -577,16 +585,16 @@ @@ -596,96 +604,96 @@ + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -739,31 +738,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj index c23ea96911..496d84559d 100644 --- a/build/msw/wx_vc7_xrc.vcproj +++ b/build/msw/wx_vc7_xrc.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,86 @@ + + + + + + + + + + + + + + + + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib" + SuppressStartupBanner="TRUE"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> - - - - - - - - - - - - - - - + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb" + TargetMachine="1"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -574,16 +582,16 @@ @@ -593,96 +601,96 @@ - - + Name="Debug|Win32"> + Name="Release|Win32"> - + Name="Universal Release|Win32"/> + + Name="DLL Release|Win32"> + + + Name="Debug|Win32"/> + + + Name="Universal Release|Win32"> - + Name="DLL Release|Win32"/> + + Name="DLL Universal Release|Win32"> - - - - - + Name="Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/> + Name="Release|Win32"> + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/> + Name="Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/> @@ -736,31 +735,40 @@ AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/> + Name="DLL Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/> + Name="DLL Release|Win32"> + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/> + Name="DLL Universal Debug|Win32"> + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/> + + + diff --git a/build/msw/wx_vc8.sln b/build/msw/wx_vc8.sln index 7b145af729..c93bec4109 100644 --- a/build/msw/wx_vc8.sln +++ b/build/msw/wx_vc8.sln @@ -47,352 +47,352 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc8_gl.vcproj", "{ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.ActiveCfg = Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.Build.0 = Release|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.ActiveCfg = Debug|Win32 {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.Build.0 = Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.ActiveCfg = Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.Build.0 = Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.ActiveCfg = Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.Build.0 = Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.ActiveCfg = Debug|Win32 {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.Build.0 = Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.ActiveCfg = Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.Build.0 = Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.ActiveCfg = Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.Build.0 = Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.ActiveCfg = Debug|Win32 {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.Build.0 = Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.ActiveCfg = Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.Build.0 = Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.ActiveCfg = Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.Build.0 = Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.ActiveCfg = Debug|Win32 {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.Build.0 = Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.ActiveCfg = Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.Build.0 = Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.ActiveCfg = Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.Build.0 = Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.ActiveCfg = Debug|Win32 {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.Build.0 = Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.ActiveCfg = Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.Build.0 = Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.ActiveCfg = Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.Build.0 = Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.ActiveCfg = Debug|Win32 {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.Build.0 = Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.ActiveCfg = Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.Build.0 = Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.ActiveCfg = Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.Build.0 = Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.ActiveCfg = Debug|Win32 {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.Build.0 = Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.ActiveCfg = Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.Build.0 = Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.ActiveCfg = Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.Build.0 = Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.ActiveCfg = Debug|Win32 {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.Build.0 = Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.ActiveCfg = Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.Build.0 = Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.ActiveCfg = Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.Build.0 = Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.ActiveCfg = Debug|Win32 {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.Build.0 = Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.ActiveCfg = Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.Build.0 = Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.ActiveCfg = Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.Build.0 = Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.ActiveCfg = Debug|Win32 {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.Build.0 = Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.ActiveCfg = Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.Build.0 = Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.ActiveCfg = Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.Build.0 = Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.ActiveCfg = Debug|Win32 {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.Build.0 = Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.ActiveCfg = Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.Build.0 = Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.ActiveCfg = Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.Build.0 = Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.Build.0 = Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.ActiveCfg = Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.Build.0 = Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.ActiveCfg = Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.Build.0 = Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.ActiveCfg = Debug|Win32 {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.Build.0 = Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.ActiveCfg = Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.Build.0 = Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.ActiveCfg = Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.Build.0 = Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.ActiveCfg = Debug|Win32 {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.Build.0 = Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.ActiveCfg = Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.Build.0 = Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.ActiveCfg = Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.Build.0 = Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.ActiveCfg = Debug|Win32 {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.Build.0 = Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.ActiveCfg = Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.Build.0 = Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.ActiveCfg = Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.Build.0 = Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.ActiveCfg = Debug|Win32 {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.Build.0 = Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.ActiveCfg = Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.Build.0 = Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.ActiveCfg = Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.Build.0 = Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.ActiveCfg = Debug|Win32 {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.Build.0 = Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.Build.0 = Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.ActiveCfg = Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.Build.0 = Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32 {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.ActiveCfg = Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.Build.0 = Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.Build.0 = Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32 {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.Build.0 = Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.ActiveCfg = Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.Build.0 = Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.ActiveCfg = Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.Build.0 = Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.ActiveCfg = Debug|Win32 {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.Build.0 = Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.ActiveCfg = Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.Build.0 = Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.ActiveCfg = Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.Build.0 = Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.ActiveCfg = Debug|Win32 {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.Build.0 = Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.ActiveCfg = Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.Build.0 = Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index 7197e94724..5337f5728d 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ @@ -851,19 +859,19 @@ RelativePath="..\..\src\msw\calctrl.cpp" > @@ -871,19 +879,19 @@ RelativePath="..\..\src\msw\datecontrols.cpp" > @@ -891,19 +899,19 @@ RelativePath="..\..\src\msw\datectrl.cpp" > @@ -927,19 +935,19 @@ RelativePath="..\..\src\msw\version.rc" > @@ -1041,121 +1049,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj index a1cc094752..de20e3b40f 100644 --- a/build/msw/wx_vc8_aui.vcproj +++ b/build/msw/wx_vc8_aui.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index 1572da419f..cfa90c7b1e 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ - @@ -1304,121 +1312,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 839e301968..b4c6d4d7b8 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -1251,19 +1291,19 @@ RelativePath="..\..\src\msw\ole\access.cpp" > @@ -1271,19 +1311,19 @@ RelativePath="..\..\src\msw\ole\activex.cpp" > @@ -1295,19 +1335,19 @@ RelativePath="..\..\src\msw\artmsw.cpp" > @@ -1323,19 +1363,51 @@ RelativePath="..\..\src\msw\bmpbuttn.cpp" > + + + + + + + + + + + + @@ -1347,19 +1419,51 @@ RelativePath="..\..\src\msw\button.cpp" > - + Name="Debug|Win32" + > + + + + + + + + + + + + + @@ -1371,19 +1475,51 @@ RelativePath="..\..\src\msw\checkbox.cpp" > + + + + + + + + + + + + @@ -1391,19 +1527,51 @@ RelativePath="..\..\src\msw\checklst.cpp" > + + + + + + + + + + + + @@ -1411,19 +1579,51 @@ RelativePath="..\..\src\msw\choice.cpp" > + + + + + + + + + + + + @@ -1435,19 +1635,19 @@ RelativePath="..\..\src\msw\colordlg.cpp" > @@ -1459,19 +1659,19 @@ RelativePath="..\..\src\msw\combo.cpp" > @@ -1479,19 +1679,51 @@ RelativePath="..\..\src\msw\combobox.cpp" > + + + + + + + + + + + + @@ -1499,19 +1731,51 @@ RelativePath="..\..\src\msw\control.cpp" > + + + + + + + + + + + + @@ -1551,11 +1815,23 @@ RelativePath="..\..\src\msw\dialog.cpp" > + Name="Debug|Win32" + > + + + + + - - - - + + + + + + + + + + + @@ -1603,19 +1899,19 @@ RelativePath="..\..\src\msw\dragimag.cpp" > @@ -1639,19 +1935,51 @@ RelativePath="..\..\src\msw\fdrepdlg.cpp" > + + + + + + + + + + + + @@ -1659,19 +1987,19 @@ RelativePath="..\..\src\msw\filedlg.cpp" > @@ -1683,19 +2011,19 @@ RelativePath="..\..\src\msw\fontdlg.cpp" > @@ -1711,19 +2039,19 @@ RelativePath="..\..\src\msw\frame.cpp" > @@ -1731,19 +2059,51 @@ RelativePath="..\..\src\msw\gauge.cpp" > + + + + + + + + + + + + @@ -1767,19 +2127,19 @@ RelativePath="..\..\src\msw\headerctrl.cpp" > @@ -1803,19 +2163,19 @@ RelativePath="..\..\src\msw\iniconf.cpp" > @@ -1823,19 +2183,51 @@ RelativePath="..\..\src\msw\listbox.cpp" > + + + + + + + + + + + + @@ -1843,19 +2235,51 @@ RelativePath="..\..\src\msw\listctrl.cpp" > + + + + + + + + + + + + @@ -1867,19 +2291,19 @@ RelativePath="..\..\src\msw\mdi.cpp" > @@ -1887,11 +2311,23 @@ RelativePath="..\..\src\msw\menu.cpp" > + Name="Debug|Win32" + > + + + + + + + + + + + + @@ -1927,19 +2383,19 @@ RelativePath="..\..\src\msw\metafile.cpp" > @@ -1951,19 +2407,19 @@ RelativePath="..\..\src\msw\msgdlg.cpp" > @@ -1975,19 +2431,19 @@ RelativePath="..\..\src\msw\nativdlg.cpp" > @@ -1995,19 +2451,19 @@ RelativePath="..\..\src\msw\nativewin.cpp" > @@ -2015,19 +2471,51 @@ RelativePath="..\..\src\msw\notebook.cpp" > + + + + + + + + + + + + @@ -2039,19 +2527,19 @@ RelativePath="..\..\src\msw\ownerdrw.cpp" > @@ -2079,19 +2567,51 @@ RelativePath="..\..\src\msw\radiobox.cpp" > + + + + + + + + + + + + @@ -2099,19 +2619,51 @@ RelativePath="..\..\src\msw\radiobut.cpp" > + + + + + + + + + + + + @@ -2127,19 +2679,51 @@ RelativePath="..\..\src\msw\scrolbar.cpp" > + + + + + + + + + + + + @@ -2151,11 +2735,23 @@ RelativePath="..\..\src\msw\slider.cpp" > + Name="Debug|Win32" + > + + + + + - - + Name="DLL Debug|Win32" + > + + + Name="DLL Release|Win32" + > + + - + + + + + + + + + + + + + + + + + @@ -2191,19 +2839,19 @@ RelativePath="..\..\src\msw\spinctrl.cpp" > @@ -2211,19 +2859,51 @@ RelativePath="..\..\src\msw\statbmp.cpp" > + + + + + + + + + + + + @@ -2231,19 +2911,51 @@ RelativePath="..\..\src\msw\statbox.cpp" > + + + + + + + + + + + + @@ -2251,19 +2963,51 @@ RelativePath="..\..\src\msw\statline.cpp" > + + + + + + + + + + + + @@ -2271,19 +3015,51 @@ RelativePath="..\..\src\msw\stattext.cpp" > + + + + + + + + + + + + @@ -2291,19 +3067,19 @@ RelativePath="..\..\src\msw\statusbar.cpp" > @@ -2311,19 +3087,51 @@ RelativePath="..\..\src\msw\textctrl.cpp" > + + + + + + + + + + + + @@ -2331,19 +3139,19 @@ RelativePath="..\..\src\msw\textentry.cpp" > @@ -2351,19 +3159,51 @@ RelativePath="..\..\src\msw\tglbtn.cpp" > - + + + + + + + + + + + + + @@ -2371,19 +3211,51 @@ RelativePath="..\..\src\msw\toolbar.cpp" > + + + + + + + + + + + + @@ -2399,19 +3271,19 @@ RelativePath="..\..\src\msw\treectrl.cpp" > @@ -2431,19 +3303,19 @@ RelativePath="..\..\src\msw\version.rc" > @@ -2464,21 +3336,53 @@ RelativePath="..\..\src\generic\accel.cpp" > + + + + + + + + + + + + @@ -2540,19 +3444,19 @@ RelativePath="..\..\src\generic\dirdlgg.cpp" > @@ -2564,21 +3468,53 @@ RelativePath="..\..\src\generic\fdrepdlg.cpp" > + + + + + + + + + + + + @@ -2612,19 +3548,19 @@ RelativePath="..\..\src\generic\fontdlgg.cpp" > @@ -2644,21 +3580,53 @@ RelativePath="..\..\src\generic\listctrl.cpp" > + + + + + + + + + + + + @@ -2688,19 +3656,19 @@ RelativePath="..\..\src\generic\msgdlgg.cpp" > @@ -2760,19 +3728,51 @@ RelativePath="..\..\src\generic\statusbr.cpp" > + Name="Debug|Win32" + > + + + Name="Release|Win32" + > + + + + + + + + + + @@ -2813,131 +3813,319 @@ RelativePath="..\..\src\univ\bmpbuttn.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + Name="Universal Debug|Win32" + > + + + + + + + + + + + + + + @@ -2973,39 +4197,71 @@ RelativePath="..\..\src\univ\dialog.cpp" > + + + + + + + + + + + + @@ -3013,39 +4269,71 @@ RelativePath="..\..\src\univ\gauge.cpp" > + + + + + + + + + + + + @@ -3053,19 +4341,19 @@ RelativePath="..\..\src\univ\inpcons.cpp" > @@ -3073,19 +4361,19 @@ RelativePath="..\..\src\univ\inphand.cpp" > @@ -3093,59 +4381,123 @@ RelativePath="..\..\src\univ\listbox.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + @@ -3153,19 +4505,19 @@ RelativePath="..\..\src\univ\themes\mono.cpp" > @@ -3173,79 +4525,175 @@ RelativePath="..\..\src\univ\notebook.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3253,39 +4701,71 @@ RelativePath="..\..\src\univ\scrolbar.cpp" > + + + + + + + + + + + + @@ -3293,19 +4773,19 @@ RelativePath="..\..\src\univ\settingsuniv.cpp" > @@ -3313,159 +4793,383 @@ RelativePath="..\..\src\univ\slider.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3473,59 +5177,123 @@ RelativePath="..\..\src\univ\textctrl.cpp" > + + + + + + + + + + + + + + + + + + + + Name="DLL Universal Debug|Win32" + > + + + + + @@ -3533,39 +5301,71 @@ RelativePath="..\..\src\univ\toolbar.cpp" > + + + + + + + + + + + + @@ -3573,19 +5373,19 @@ RelativePath="..\..\src\univ\themes\win32.cpp" > @@ -3593,19 +5393,19 @@ RelativePath="..\..\src\univ\winuniv.cpp" > @@ -3618,121 +5418,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj index 6c8050dd0e..055a3bdde1 100644 --- a/build/msw/wx_vc8_gl.vcproj +++ b/build/msw/wx_vc8_gl.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -836,121 +844,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 6022d5f31b..6178acedfe 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ @@ -934,121 +942,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj index 428d2ffb24..3c01157de7 100644 --- a/build/msw/wx_vc8_media.vcproj +++ b/build/msw/wx_vc8_media.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -844,121 +852,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 90339ae10c..86a8db396f 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -876,121 +884,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj index 230599c84c..5bb82bd012 100644 --- a/build/msw/wx_vc8_propgrid.vcproj +++ b/build/msw/wx_vc8_propgrid.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj index b62abf0837..6d0702dd2b 100644 --- a/build/msw/wx_vc8_qa.vcproj +++ b/build/msw/wx_vc8_qa.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -841,121 +849,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index 7defb218d0..9409300db7 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj index 689ff12ce2..5d4e596d5d 100644 --- a/build/msw/wx_vc8_stc.vcproj +++ b/build/msw/wx_vc8_stc.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj index fcf65740c0..09822dfbe0 100644 --- a/build/msw/wx_vc8_wxexpat.vcproj +++ b/build/msw/wx_vc8_wxexpat.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -74,7 +78,7 @@ /> @@ -154,7 +156,7 @@ /> @@ -231,7 +237,7 @@ /> @@ -311,7 +315,7 @@ /> @@ -388,7 +396,7 @@ /> @@ -468,7 +474,7 @@ /> @@ -545,7 +555,7 @@ /> @@ -625,7 +633,7 @@ /> @@ -22,9 +22,9 @@ @@ -785,121 +793,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj index 56d362c232..225da88e8c 100644 --- a/build/msw/wx_vc8_wxscintilla.vcproj +++ b/build/msw/wx_vc8_wxscintilla.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -74,7 +78,7 @@ /> @@ -154,7 +156,7 @@ /> @@ -231,7 +237,7 @@ /> @@ -311,7 +315,7 @@ /> @@ -388,7 +396,7 @@ /> @@ -468,7 +474,7 @@ /> @@ -545,7 +555,7 @@ /> @@ -625,7 +633,7 @@ /> @@ -22,9 +22,9 @@ @@ -74,7 +78,7 @@ /> @@ -154,7 +156,7 @@ /> @@ -231,7 +237,7 @@ /> @@ -311,7 +315,7 @@ /> @@ -388,7 +396,7 @@ /> @@ -468,7 +474,7 @@ /> @@ -545,7 +555,7 @@ /> @@ -625,7 +633,7 @@ /> @@ -22,9 +22,9 @@ @@ -74,7 +78,7 @@ /> @@ -154,7 +156,7 @@ /> @@ -231,7 +237,7 @@ /> @@ -311,7 +315,7 @@ /> @@ -388,7 +396,7 @@ /> @@ -468,7 +474,7 @@ /> @@ -545,7 +555,7 @@ /> @@ -625,7 +633,7 @@ /> @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -832,121 +840,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index 110c003821..6b49c9c918 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,95 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc9.sln b/build/msw/wx_vc9.sln index 364a026c59..86fc0de07d 100644 --- a/build/msw/wx_vc9.sln +++ b/build/msw/wx_vc9.sln @@ -47,352 +47,352 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc9_gl.vcproj", "{ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index 8448b91c0b..929f36b96e 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ @@ -847,19 +855,19 @@ RelativePath="..\..\src\msw\calctrl.cpp" > @@ -867,19 +875,19 @@ RelativePath="..\..\src\msw\datecontrols.cpp" > @@ -887,19 +895,19 @@ RelativePath="..\..\src\msw\datectrl.cpp" > @@ -923,19 +931,19 @@ RelativePath="..\..\src\msw\version.rc" > @@ -1037,121 +1045,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj index 5c969f2ed8..69e43efa56 100644 --- a/build/msw/wx_vc9_aui.vcproj +++ b/build/msw/wx_vc9_aui.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -824,121 +832,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index 68a24b3277..78e2180a19 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ - - + @@ -1300,121 +1308,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 6d210cc44d..2e1321a448 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -1247,19 +1287,19 @@ RelativePath="..\..\src\msw\ole\access.cpp" > @@ -1267,19 +1307,19 @@ RelativePath="..\..\src\msw\ole\activex.cpp" > @@ -1291,19 +1331,19 @@ RelativePath="..\..\src\msw\artmsw.cpp" > @@ -1319,19 +1359,51 @@ RelativePath="..\..\src\msw\bmpbuttn.cpp" > + + + + + + + + + + + + @@ -1343,11 +1415,23 @@ RelativePath="..\..\src\msw\button.cpp" > + Name="Debug|Win32" + > + + + + + + + + + + + + + + + + + + + + + + + + @@ -1387,19 +1523,51 @@ RelativePath="..\..\src\msw\checklst.cpp" > + + + + + + + + + + + + @@ -1407,19 +1575,51 @@ RelativePath="..\..\src\msw\choice.cpp" > + + + + + + + + + + + + @@ -1431,19 +1631,19 @@ RelativePath="..\..\src\msw\colordlg.cpp" > @@ -1455,19 +1655,19 @@ RelativePath="..\..\src\msw\combo.cpp" > @@ -1475,19 +1675,51 @@ RelativePath="..\..\src\msw\combobox.cpp" > + + + + + + + + + + + + @@ -1495,19 +1727,51 @@ RelativePath="..\..\src\msw\control.cpp" > + + + + + + + + + + + + @@ -1547,19 +1811,51 @@ RelativePath="..\..\src\msw\dialog.cpp" > + + + + + + + + + + + + @@ -1575,19 +1871,19 @@ RelativePath="..\..\src\msw\dirdlg.cpp" > @@ -1599,19 +1895,19 @@ RelativePath="..\..\src\msw\dragimag.cpp" > @@ -1635,19 +1931,51 @@ RelativePath="..\..\src\msw\fdrepdlg.cpp" > + + + + + + + + + + + + @@ -1655,19 +1983,19 @@ RelativePath="..\..\src\msw\filedlg.cpp" > @@ -1679,19 +2007,19 @@ RelativePath="..\..\src\msw\fontdlg.cpp" > @@ -1707,19 +2035,19 @@ RelativePath="..\..\src\msw\frame.cpp" > @@ -1727,19 +2055,51 @@ RelativePath="..\..\src\msw\gauge.cpp" > + + + + + + + + + + + + @@ -1763,19 +2123,19 @@ RelativePath="..\..\src\msw\headerctrl.cpp" > @@ -1799,19 +2159,19 @@ RelativePath="..\..\src\msw\iniconf.cpp" > @@ -1819,19 +2179,51 @@ RelativePath="..\..\src\msw\listbox.cpp" > + + + + + + + + + + + + @@ -1839,19 +2231,51 @@ RelativePath="..\..\src\msw\listctrl.cpp" > + + + + + + + + + + + + @@ -1863,19 +2287,19 @@ RelativePath="..\..\src\msw\mdi.cpp" > @@ -1883,19 +2307,51 @@ RelativePath="..\..\src\msw\menu.cpp" > + + + + + + + + + + + + @@ -1903,19 +2359,19 @@ RelativePath="..\..\src\msw\menuitem.cpp" > @@ -1923,19 +2379,19 @@ RelativePath="..\..\src\msw\metafile.cpp" > @@ -1947,19 +2403,19 @@ RelativePath="..\..\src\msw\msgdlg.cpp" > @@ -1971,19 +2427,19 @@ RelativePath="..\..\src\msw\nativdlg.cpp" > @@ -1991,19 +2447,19 @@ RelativePath="..\..\src\msw\nativewin.cpp" > @@ -2011,19 +2467,51 @@ RelativePath="..\..\src\msw\notebook.cpp" > + + + + + + + + + + + + @@ -2035,19 +2523,19 @@ RelativePath="..\..\src\msw\ownerdrw.cpp" > @@ -2075,19 +2563,51 @@ RelativePath="..\..\src\msw\radiobox.cpp" > + + + + + + + + + + + + @@ -2095,19 +2615,51 @@ RelativePath="..\..\src\msw\radiobut.cpp" > + + + + + + + + + + + + @@ -2123,19 +2675,51 @@ RelativePath="..\..\src\msw\scrolbar.cpp" > + + + + + + + + + + + + @@ -2147,19 +2731,51 @@ RelativePath="..\..\src\msw\slider.cpp" > + + + + + + + + + + + + @@ -2167,19 +2783,51 @@ RelativePath="..\..\src\msw\spinbutt.cpp" > + + + + + + + + + + + + @@ -2187,19 +2835,19 @@ RelativePath="..\..\src\msw\spinctrl.cpp" > @@ -2207,19 +2855,51 @@ RelativePath="..\..\src\msw\statbmp.cpp" > + + + + + + + + + + + + @@ -2227,19 +2907,51 @@ RelativePath="..\..\src\msw\statbox.cpp" > + + + + + + + + + + + + @@ -2247,19 +2959,51 @@ RelativePath="..\..\src\msw\statline.cpp" > + + + + + + + + + + + + @@ -2267,19 +3011,51 @@ RelativePath="..\..\src\msw\stattext.cpp" > + + + + + + + + + + + + @@ -2287,19 +3063,19 @@ RelativePath="..\..\src\msw\statusbar.cpp" > @@ -2307,19 +3083,51 @@ RelativePath="..\..\src\msw\textctrl.cpp" > + + + + + + + + + + + + @@ -2327,19 +3135,19 @@ RelativePath="..\..\src\msw\textentry.cpp" > @@ -2347,19 +3155,51 @@ RelativePath="..\..\src\msw\tglbtn.cpp" > + + + + + + + + + + + + @@ -2367,11 +3207,23 @@ RelativePath="..\..\src\msw\toolbar.cpp" > + Name="Debug|Win32" + > + + + + + - - + + + + + + + + + @@ -2427,19 +3299,19 @@ RelativePath="..\..\src\msw\version.rc" > @@ -2460,21 +3332,53 @@ RelativePath="..\..\src\generic\accel.cpp" > + + + + + + + + + + + + @@ -2536,19 +3440,19 @@ RelativePath="..\..\src\generic\dirdlgg.cpp" > @@ -2560,21 +3464,53 @@ RelativePath="..\..\src\generic\fdrepdlg.cpp" > + + + + + + + + + + + + @@ -2608,19 +3544,19 @@ RelativePath="..\..\src\generic\fontdlgg.cpp" > @@ -2640,21 +3576,53 @@ RelativePath="..\..\src\generic\listctrl.cpp" > + + + + + + + + + + + + @@ -2684,19 +3652,19 @@ RelativePath="..\..\src\generic\msgdlgg.cpp" > @@ -2756,19 +3724,51 @@ RelativePath="..\..\src\generic\statusbr.cpp" > + + + + + + + + + + + + @@ -2809,159 +3809,383 @@ RelativePath="..\..\src\univ\bmpbuttn.cpp" > + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2969,39 +4193,71 @@ RelativePath="..\..\src\univ\dialog.cpp" > + + + + + + + + + + + + @@ -3009,39 +4265,71 @@ RelativePath="..\..\src\univ\gauge.cpp" > + + + + + + + + + + + + @@ -3049,19 +4337,19 @@ RelativePath="..\..\src\univ\inpcons.cpp" > @@ -3069,19 +4357,19 @@ RelativePath="..\..\src\univ\inphand.cpp" > @@ -3089,59 +4377,123 @@ RelativePath="..\..\src\univ\listbox.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + @@ -3149,19 +4501,19 @@ RelativePath="..\..\src\univ\themes\mono.cpp" > @@ -3169,79 +4521,175 @@ RelativePath="..\..\src\univ\notebook.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3249,39 +4697,71 @@ RelativePath="..\..\src\univ\scrolbar.cpp" > + + + + + + + + + + + + @@ -3289,19 +4769,19 @@ RelativePath="..\..\src\univ\settingsuniv.cpp" > @@ -3309,31 +4789,111 @@ RelativePath="..\..\src\univ\slider.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + Name="Universal Debug|Win32" + > + + + Name="Universal Release|Win32" + > + + + Name="DLL Universal Debug|Win32" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3469,59 +5173,123 @@ RelativePath="..\..\src\univ\textctrl.cpp" > + + + + + + + + + + + + + + + + + + + + Name="DLL Universal Debug|Win32" + > + + + + + @@ -3529,39 +5297,71 @@ RelativePath="..\..\src\univ\toolbar.cpp" > + + + + + + + + + + + + @@ -3569,19 +5369,19 @@ RelativePath="..\..\src\univ\themes\win32.cpp" > @@ -3589,19 +5389,19 @@ RelativePath="..\..\src\univ\winuniv.cpp" > @@ -3614,121 +5414,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj index b6539366b1..5797130799 100644 --- a/build/msw/wx_vc9_gl.vcproj +++ b/build/msw/wx_vc9_gl.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -832,121 +840,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index 6e785c0faf..d941db2939 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,10 @@ - @@ -930,121 +938,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj index c5138e9b1d..05eb762b42 100644 --- a/build/msw/wx_vc9_media.vcproj +++ b/build/msw/wx_vc9_media.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -840,121 +848,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index 25eefa32b7..50462341e3 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -872,121 +880,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj index 92d2430a01..5bdee93516 100644 --- a/build/msw/wx_vc9_propgrid.vcproj +++ b/build/msw/wx_vc9_propgrid.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -824,121 +832,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj index d65c2fca15..ed9eda5d71 100644 --- a/build/msw/wx_vc9_qa.vcproj +++ b/build/msw/wx_vc9_qa.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -837,121 +845,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index 4fbd378bf8..c3861e5a5e 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -824,121 +832,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj index 440b33463d..58dec756ba 100644 --- a/build/msw/wx_vc9_stc.vcproj +++ b/build/msw/wx_vc9_stc.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -824,121 +832,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj index 565b19c602..cf073a20f6 100644 --- a/build/msw/wx_vc9_wxexpat.vcproj +++ b/build/msw/wx_vc9_wxexpat.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -74,7 +77,7 @@ /> @@ -153,7 +155,7 @@ /> @@ -230,7 +235,7 @@ /> @@ -309,7 +313,7 @@ /> @@ -386,7 +393,7 @@ /> @@ -465,7 +471,7 @@ /> @@ -542,7 +551,7 @@ /> @@ -621,7 +629,7 @@ /> @@ -22,9 +22,9 @@ @@ -781,121 +789,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj index c062ef5f81..7cd203b3ab 100644 --- a/build/msw/wx_vc9_wxscintilla.vcproj +++ b/build/msw/wx_vc9_wxscintilla.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -74,7 +77,7 @@ /> @@ -153,7 +155,7 @@ /> @@ -230,7 +235,7 @@ /> @@ -309,7 +313,7 @@ /> @@ -386,7 +393,7 @@ /> @@ -465,7 +471,7 @@ /> @@ -542,7 +551,7 @@ /> @@ -621,7 +629,7 @@ /> @@ -22,9 +22,9 @@ @@ -74,7 +77,7 @@ /> @@ -153,7 +155,7 @@ /> @@ -230,7 +235,7 @@ /> @@ -309,7 +313,7 @@ /> @@ -386,7 +393,7 @@ /> @@ -465,7 +471,7 @@ /> @@ -542,7 +551,7 @@ /> @@ -621,7 +629,7 @@ /> @@ -22,9 +22,9 @@ @@ -74,7 +77,7 @@ /> @@ -153,7 +155,7 @@ /> @@ -230,7 +235,7 @@ /> @@ -309,7 +313,7 @@ /> @@ -386,7 +393,7 @@ /> @@ -465,7 +471,7 @@ /> @@ -542,7 +551,7 @@ /> @@ -621,7 +629,7 @@ /> @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -828,121 +836,121 @@ RelativePath="..\..\include\wx\univ\setup.h" > + + - - - - + + diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index 94ef4e0d54..b22d738d7a 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -1,8 +1,8 @@ @@ -22,10 +22,94 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -824,121 +832,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > - - + + + + - - diff --git a/demos/Makefile.in b/demos/Makefile.in index ec1011d604..605ee0f588 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 369959a47e..390b316b37 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj index cc8e746d2c..4b03a3c70f 100644 --- a/demos/bombs/bombs_vc7.vcproj +++ b/demos/bombs/bombs_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index a35836db6a..f97ac6deba 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj index c3504dc513..e0e8e0a9da 100644 --- a/demos/forty/forty_vc7.vcproj +++ b/demos/forty/forty_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 24eac54076..e59f0188ca 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj index ef0b8cf4cb..1dc4a912f9 100644 --- a/demos/fractal/fractal_vc7.vcproj +++ b/demos/fractal/fractal_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 10411b3893..a7edf47e7e 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj index 2cec633e6b..83feae04c3 100644 --- a/demos/life/life_vc7.vcproj +++ b/demos/life/life_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/makefile.bcc b/demos/makefile.bcc index ff15accdc0..51b87dbcc2 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.gcc b/demos/makefile.gcc index 92f19290f4..92eb5c9763 100644 --- a/demos/makefile.gcc +++ b/demos/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.vc b/demos/makefile.vc index c592db62be..e3905fe65c 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.wat b/demos/makefile.wat index e77f578e70..8467e5fc44 100644 --- a/demos/makefile.wat +++ b/demos/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 765255e9c5..413c558af5 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 a8883635b4..e61a5c3259 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index 0c98f32837..1ea8acaf64 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 61e2b2cddf..f3026a3d40 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 3edd8c76a3..34e4c13fbd 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj index 8445124008..6394d9016d 100644 --- a/demos/poem/poem_vc7.vcproj +++ b/demos/poem/poem_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 7a26d582d2..ec0d43e407 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj index 95a52e8db3..ed3de550db 100644 --- a/samples/animate/anitest_vc7.vcproj +++ b/samples/animate/anitest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj index bf7257117f..b57fb6a0e0 100644 --- a/samples/animate/anitest_vc8.vcproj +++ b/samples/animate/anitest_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/animate/anitest_vc9.vcproj b/samples/animate/anitest_vc9.vcproj index c9002527f8..88e1f4de72 100644 --- a/samples/animate/anitest_vc9.vcproj +++ b/samples/animate/anitest_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc index 977f4e756d..dddbc0b839 100644 --- a/samples/animate/makefile.bcc +++ b/samples/animate/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc index 3ea072c106..8930d94f4c 100644 --- a/samples/animate/makefile.gcc +++ b/samples/animate/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx index 37bbcfd295..40deb1fc1f 100644 --- a/samples/animate/makefile.unx +++ b/samples/animate/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) anitest: $(ANITEST_OBJECTS) - $(CXX) -o $@ $(ANITEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` anitest_anitest.o: ./anitest.cpp $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index 70d5310074..3ea6dae3b9 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat index 73841130db..425ced12d9 100644 --- a/samples/animate/makefile.wat +++ b/samples/animate/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 9960b22f9b..d38fab98cf 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj index 02910f5238..89af0eddbd 100644 --- a/samples/artprov/artprov_vc7.vcproj +++ b/samples/artprov/artprov_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 05f2cc4b72..ff0ad83375 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/auidemo_vc7.vcproj b/samples/aui/auidemo_vc7.vcproj index d48608b657..3fe9f400dc 100644 --- a/samples/aui/auidemo_vc7.vcproj +++ b/samples/aui/auidemo_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/aui/auidemo_vc8.vcproj b/samples/aui/auidemo_vc8.vcproj index ee80fbbae0..748cc83376 100644 --- a/samples/aui/auidemo_vc8.vcproj +++ b/samples/aui/auidemo_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/aui/auidemo_vc9.vcproj b/samples/aui/auidemo_vc9.vcproj index a6d5fc9613..d6b58b9b72 100644 --- a/samples/aui/auidemo_vc9.vcproj +++ b/samples/aui/auidemo_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc index 2671a6eada..c37174f2f6 100644 --- a/samples/aui/makefile.bcc +++ b/samples/aui/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc index 0375e82ccf..5b62dda767 100644 --- a/samples/aui/makefile.gcc +++ b/samples/aui/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx index 7c43340e9e..da010905a7 100644 --- a/samples/aui/makefile.unx +++ b/samples/aui/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) auidemo: $(AUIDEMO_OBJECTS) - $(CXX) -o $@ $(AUIDEMO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,adv,core,xml,base` $(LDFLAGS) + $(CXX) -o $@ $(AUIDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,html,adv,core,xml,base` auidemo_auidemo.o: ./auidemo.cpp $(CXX) -c -o $@ $(AUIDEMO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index c536b0cf81..cbfa9cea63 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat index 4f14c8e294..5005dfb4bc 100644 --- a/samples/aui/makefile.wat +++ b/samples/aui/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 14be5bae1e..6541ff8f85 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj index 0606064fac..dfd73476c8 100644 --- a/samples/calendar/calendar_vc7.vcproj +++ b/samples/calendar/calendar_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 8c1fa4b0dc..776ee6c3c3 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj index 8288e029f1..495e5eec27 100644 --- a/samples/caret/caret_vc7.vcproj +++ b/samples/caret/caret_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index ae3f2cc88e..97fe1ae67a 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj index 8de8155986..4672118651 100644 --- a/samples/clipboard/clipboard_vc7.vcproj +++ b/samples/clipboard/clipboard_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index e5b81936e6..5cdf69c42f 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/collpane_vc7.vcproj b/samples/collpane/collpane_vc7.vcproj index ebea12643f..fe403a4d66 100644 --- a/samples/collpane/collpane_vc7.vcproj +++ b/samples/collpane/collpane_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/collpane/collpane_vc8.vcproj b/samples/collpane/collpane_vc8.vcproj index 04324c794e..603194b1fd 100644 --- a/samples/collpane/collpane_vc8.vcproj +++ b/samples/collpane/collpane_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/collpane/collpane_vc9.vcproj b/samples/collpane/collpane_vc9.vcproj index c833b52f66..d132a9bcdd 100644 --- a/samples/collpane/collpane_vc9.vcproj +++ b/samples/collpane/collpane_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc index 6d040d6f86..d5ac13d8d9 100644 --- a/samples/collpane/makefile.bcc +++ b/samples/collpane/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc index bd2da79aba..90f1e9d173 100644 --- a/samples/collpane/makefile.gcc +++ b/samples/collpane/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx index c830b12502..b4c3d48633 100644 --- a/samples/collpane/makefile.unx +++ b/samples/collpane/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) collpane: $(COLLPANE_OBJECTS) - $(CXX) -o $@ $(COLLPANE_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(COLLPANE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` collpane_collpane.o: ./collpane.cpp $(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index aa0054f2e8..c49e222411 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat index aeaa7b9fc2..6c68b71ba8 100644 --- a/samples/collpane/makefile.wat +++ b/samples/collpane/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 4aafc0e0af..3e62b3a849 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/combo_vc7.vcproj b/samples/combo/combo_vc7.vcproj index 9efe07ccca..7b31a3df8b 100644 --- a/samples/combo/combo_vc7.vcproj +++ b/samples/combo/combo_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/combo/combo_vc8.vcproj b/samples/combo/combo_vc8.vcproj index a10513bfcc..de7eab80ad 100644 --- a/samples/combo/combo_vc8.vcproj +++ b/samples/combo/combo_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/combo/combo_vc9.vcproj b/samples/combo/combo_vc9.vcproj index 5c6c3715f0..4a9c70989f 100644 --- a/samples/combo/combo_vc9.vcproj +++ b/samples/combo/combo_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc index 2f7a7cd824..ac6e40fe59 100644 --- a/samples/combo/makefile.bcc +++ b/samples/combo/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc index d2f2e7aea1..2f1fd1b38d 100644 --- a/samples/combo/makefile.gcc +++ b/samples/combo/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx index a13c22df3d..a017c88be4 100644 --- a/samples/combo/makefile.unx +++ b/samples/combo/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) combo: $(COMBO_OBJECTS) - $(CXX) -o $@ $(COMBO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(COMBO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` combo_combo.o: ./combo.cpp $(CXX) -c -o $@ $(COMBO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index e0372ffb06..8ae8fe082a 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat index d271425f12..22e6de0652 100644 --- a/samples/combo/makefile.wat +++ b/samples/combo/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 582fcdb1a4..6cff539afe 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj index 3c3f07d422..55cef477e2 100644 --- a/samples/config/config_vc7.vcproj +++ b/samples/config/config_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 35a66f191b..cf4cfed1a8 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/console_vc7.vcproj b/samples/console/console_vc7.vcproj index f0ffad9760..1939ed3249 100644 --- a/samples/console/console_vc7.vcproj +++ b/samples/console/console_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 47974b2576..2ad238889c 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/controls/controls_vc7.vcproj b/samples/controls/controls_vc7.vcproj index 29c8a4dcc8..aec1ef3b2b 100644 --- a/samples/controls/controls_vc7.vcproj +++ b/samples/controls/controls_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 3ce1ffe08c..5152c142f2 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj index d43bce48da..f14159a9d7 100644 --- a/samples/dataview/dataview_vc7.vcproj +++ b/samples/dataview/dataview_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/dataview/dataview_vc8.vcproj b/samples/dataview/dataview_vc8.vcproj index fe6be124b4..80b649d80a 100644 --- a/samples/dataview/dataview_vc8.vcproj +++ b/samples/dataview/dataview_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/dataview/dataview_vc9.vcproj b/samples/dataview/dataview_vc9.vcproj index 133de66c8f..54fa440384 100644 --- a/samples/dataview/dataview_vc9.vcproj +++ b/samples/dataview/dataview_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc index 7bb90e00ff..b18f25b000 100644 --- a/samples/dataview/makefile.bcc +++ b/samples/dataview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc index 3de26e7d19..50047fb49d 100644 --- a/samples/dataview/makefile.gcc +++ b/samples/dataview/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx index b87147b106..c30ba3eb4a 100644 --- a/samples/dataview/makefile.unx +++ b/samples/dataview/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 4c2b167026..5a285f4504 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat index 97bfa5aaf8..fc2f4542ae 100644 --- a/samples/dataview/makefile.wat +++ b/samples/dataview/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 70386b463c..9ef8b1e1ab 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/debugrpt_vc7.vcproj b/samples/debugrpt/debugrpt_vc7.vcproj index f92b776870..9c825a8adb 100644 --- a/samples/debugrpt/debugrpt_vc7.vcproj +++ b/samples/debugrpt/debugrpt_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/debugrpt/debugrpt_vc8.vcproj b/samples/debugrpt/debugrpt_vc8.vcproj index ed7937a628..0275083d9d 100644 --- a/samples/debugrpt/debugrpt_vc8.vcproj +++ b/samples/debugrpt/debugrpt_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/debugrpt/debugrpt_vc9.vcproj b/samples/debugrpt/debugrpt_vc9.vcproj index 3a8be199b4..1436c60ac4 100644 --- a/samples/debugrpt/debugrpt_vc9.vcproj +++ b/samples/debugrpt/debugrpt_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc index 71cc0dc64d..e1f95692b3 100644 --- a/samples/debugrpt/makefile.bcc +++ b/samples/debugrpt/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc index 7ecd95dcd1..aeafd71d31 100644 --- a/samples/debugrpt/makefile.gcc +++ b/samples/debugrpt/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx index 7b28b28e74..2aa97f5d4d 100644 --- a/samples/debugrpt/makefile.unx +++ b/samples/debugrpt/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) debugrpt: $(DEBUGRPT_OBJECTS) - $(CXX) -o $@ $(DEBUGRPT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs qa,core,base` $(LDFLAGS) + $(CXX) -o $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs qa,core,base` debugrpt_debugrpt.o: ./debugrpt.cpp $(CXX) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index ef322c9dd9..7fbb1f30b2 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat index 568e23df5f..0993e30fc8 100644 --- a/samples/debugrpt/makefile.wat +++ b/samples/debugrpt/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 1c0727ce07..a3c64b516b 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj index 6d3b5072cb..d55256136b 100644 --- a/samples/dialogs/dialogs_vc7.vcproj +++ b/samples/dialogs/dialogs_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\src\generic\colrdlgg.cpp"> + RelativePath="..\..\src\generic\dirdlgg.cpp"> + RelativePath="..\..\src\generic\filedlgg.cpp"> + RelativePath="..\..\src\generic\fontdlgg.cpp"> diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj index e42835c69d..40ef59a1c8 100644 --- a/samples/dialogs/dialogs_vc8.vcproj +++ b/samples/dialogs/dialogs_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -820,86 +828,86 @@ > diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj index 97494aac67..abda9d9498 100644 --- a/samples/dialogs/dialogs_vc9.vcproj +++ b/samples/dialogs/dialogs_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -792,86 +800,86 @@ > diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index f41a79e2ad..ab9aef430b 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index 9b21dfa8b0..a78121e170 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx index 788a1f12c0..93ba87eeff 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) dialogs: $(DIALOGS_OBJECTS) - $(CXX) -o $@ $(DIALOGS_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` dialogs_dialogs.o: ./dialogs.cpp $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 3ea1720c1c..70b9b86ea8 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index 1c1dd68705..a24d8f0c79 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index f5ab5520e2..f73cfc59e9 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj index 641483230c..faa69bb5ba 100644 --- a/samples/dialup/dialup_vc7.vcproj +++ b/samples/dialup/dialup_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 2b3d4803ca..51e7a1ca79 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/display_vc7.vcproj b/samples/display/display_vc7.vcproj index be8f9b659c..11cccfa7f5 100644 --- a/samples/display/display_vc7.vcproj +++ b/samples/display/display_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/display/display_vc8.vcproj b/samples/display/display_vc8.vcproj index 562c8ab12d..c8ebd3b531 100644 --- a/samples/display/display_vc8.vcproj +++ b/samples/display/display_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/display/display_vc9.vcproj b/samples/display/display_vc9.vcproj index 676e9ddd45..d3ff1ef208 100644 --- a/samples/display/display_vc9.vcproj +++ b/samples/display/display_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc index 28bf8dbed6..08613cc57c 100644 --- a/samples/display/makefile.bcc +++ b/samples/display/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index 9926ab7984..9f342c7e9e 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx index 53cbfbe5fb..05b63f7fe8 100644 --- a/samples/display/makefile.unx +++ b/samples/display/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) display: $(DISPLAY_OBJECTS) - $(CXX) -o $@ $(DISPLAY_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` display_display.o: ./display.cpp $(CXX) -c -o $@ $(DISPLAY_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index f7d9ef639c..68368747c3 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index d29eb291c6..91b2fc6481 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 3f06508a02..709cd9bb57 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/dnd_vc7.vcproj b/samples/dnd/dnd_vc7.vcproj index 80f131ade7..70ceb553a3 100644 --- a/samples/dnd/dnd_vc7.vcproj +++ b/samples/dnd/dnd_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 7f70fcee76..74a74f71dc 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj index 1fd74c89fb..c371144a87 100644 --- a/samples/docview/docview_vc7.vcproj +++ b/samples/docview/docview_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 5295d5375e..d80a4bda66 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj index d4717fc334..3c50b98c7c 100644 --- a/samples/dragimag/dragimag_vc7.vcproj +++ b/samples/dragimag/dragimag_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index ce2d89db20..28bce90fca 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj index ef3e0d3cfa..66b0b83d11 100644 --- a/samples/drawing/drawing_vc7.vcproj +++ b/samples/drawing/drawing_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 1de2b660c6..bee0491875 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj index 7dbda5f7e9..a8eae80d0b 100644 --- a/samples/erase/erase_vc7.vcproj +++ b/samples/erase/erase_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 244f1f67f8..0f61a1ede2 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj index ccb1f97db4..39c560596b 100644 --- a/samples/event/event_vc7.vcproj +++ b/samples/event/event_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 54cf2c66fa..13280d1168 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/except_vc7.vcproj b/samples/except/except_vc7.vcproj index 61bb03dc22..d99b1455e0 100644 --- a/samples/except/except_vc7.vcproj +++ b/samples/except/except_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/except/except_vc8.vcproj b/samples/except/except_vc8.vcproj index 3708563736..6e09ce41da 100644 --- a/samples/except/except_vc8.vcproj +++ b/samples/except/except_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/except/except_vc9.vcproj b/samples/except/except_vc9.vcproj index 8195e17625..f2926dc91e 100644 --- a/samples/except/except_vc9.vcproj +++ b/samples/except/except_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc index 27a497134b..36ab0204ac 100644 --- a/samples/except/makefile.bcc +++ b/samples/except/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc index 2f7af94a35..98fba0c33a 100644 --- a/samples/except/makefile.gcc +++ b/samples/except/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx index 217bfc6618..f43fd39832 100644 --- a/samples/except/makefile.unx +++ b/samples/except/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) except: $(EXCEPT_OBJECTS) - $(CXX) -o $@ $(EXCEPT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` except_except.o: ./except.cpp $(CXX) -c -o $@ $(EXCEPT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 332c4d8cb6..bd41994c65 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index c1c60a77bf..23ef393653 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 89ddc4f52c..bfefe58ac4 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj index 0cc667d20a..da6d491e78 100644 --- a/samples/exec/exec_vc7.vcproj +++ b/samples/exec/exec_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj index de5c64b6df..a8d0204519 100644 --- a/samples/exec/exec_vc8.vcproj +++ b/samples/exec/exec_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/exec/exec_vc9.vcproj b/samples/exec/exec_vc9.vcproj index 7251cf6870..d1235ef8cc 100644 --- a/samples/exec/exec_vc9.vcproj +++ b/samples/exec/exec_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index e9d13fdc25..3240db7715 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 08351a2a31..114ed5d3f8 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx index ddc4ab63e2..c32d59dc0a 100644 --- a/samples/exec/makefile.unx +++ b/samples/exec/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) exec: $(EXEC_OBJECTS) - $(CXX) -o $@ $(EXEC_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` exec_exec.o: ./exec.cpp $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 2cf1155462..b6ea2ca28b 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index c75222ef09..234a3888f0 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/flash/flash_vc7.vcproj b/samples/flash/flash_vc7.vcproj index 4682ecf96c..fe74eb0d81 100644 --- a/samples/flash/flash_vc7.vcproj +++ b/samples/flash/flash_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/flash/flash_vc8.vcproj b/samples/flash/flash_vc8.vcproj index a642da9307..dcf86be575 100644 --- a/samples/flash/flash_vc8.vcproj +++ b/samples/flash/flash_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/flash/flash_vc9.vcproj b/samples/flash/flash_vc9.vcproj index 3ec78c8d68..d96aeba3a3 100644 --- a/samples/flash/flash_vc9.vcproj +++ b/samples/flash/flash_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc index e7c1a1aa98..de1fb13ddc 100644 --- a/samples/flash/makefile.vc +++ b/samples/flash/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index a326def552..fcabab2f91 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj index 62512c8586..4169daabc6 100644 --- a/samples/font/font_vc7.vcproj +++ b/samples/font/font_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 433a6f07e6..7d45710a46 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj index a4f2bad00f..48c42fda63 100644 --- a/samples/grid/grid_vc7.vcproj +++ b/samples/grid/grid_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index c71d3de82b..206889c05b 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj index 2526958bd4..a0939ae5e9 100644 --- a/samples/help/help_vc7.vcproj +++ b/samples/help/help_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 867b9cd635..ad9f7bd757 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj index f330995c10..a03cdc2728 100644 --- a/samples/htlbox/htlbox_vc7.vcproj +++ b/samples/htlbox/htlbox_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index 020bbe99cc..9690b32754 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 5435044ee9..bd1713def7 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj index e620434b7c..5970d4aeb7 100644 --- a/samples/html/about/about_vc7.vcproj +++ b/samples/html/about/about_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index b42c06fbaa..47d2c98b21 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj index b79ced9a56..ea1864ff9e 100644 --- a/samples/html/help/help_vc7.vcproj +++ b/samples/html/help/help_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 39d7076aff..58fe211fb2 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj index 74c313c3e5..90b6ae8a8b 100644 --- a/samples/html/helpview/helpview_vc7.vcproj +++ b/samples/html/helpview/helpview_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 09cb571f17..c0c2a92dca 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 74827d97e7..45f3667f3d 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htmlctrl: $(HTMLCTRL_OBJECTS) - $(CXX) -o $@ $(HTMLCTRL_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` htmlctrl_htmlctrl.o: ./htmlctrl.cpp $(CXX) -c -o $@ $(HTMLCTRL_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc index 4d3bb1d8b4..cc8242b7bf 100644 --- a/samples/html/makefile.bcc +++ b/samples/html/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc index 89da732a38..1b735bf500 100644 --- a/samples/html/makefile.gcc +++ b/samples/html/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx index a4c75859b7..b2e181349d 100644 --- a/samples/html/makefile.unx +++ b/samples/html/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 69b8697571..8edb32f65b 100644 --- a/samples/html/makefile.vc +++ b/samples/html/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat index 6d9ccbac5c..22506427e6 100644 --- a/samples/html/makefile.wat +++ b/samples/html/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index ee69af9e7e..c4ff41483f 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 6d1847eb19..9dc8212b81 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index 39d2cb62e1..48eb761516 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx index 2ce4b376c6..5cfca5308a 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) htmlprinting: $(HTMLPRINTING_OBJECTS) - $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` $(LDFLAGS) + $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs html,core,base` htmlprinting_printing.o: ./printing.cpp $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 8935908b87..e3871d6a7b 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index 323962f5d0..1e868f91dd 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj index 194dd3548a..59dcedb612 100644 --- a/samples/html/printing/printing_vc7.vcproj +++ b/samples/html/printing/printing_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj index c1eabfc0d6..f5b801cabe 100644 --- a/samples/html/test/test_vc7.vcproj +++ b/samples/html/test/test_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj index 094e3a1a21..72930cd4e9 100644 --- a/samples/html/virtual/virtual_vc7.vcproj +++ b/samples/html/virtual/virtual_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj index 8c70fee74f..9dbfe8008c 100644 --- a/samples/html/widget/widget_vc7.vcproj +++ b/samples/html/widget/widget_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj index e091957edc..1ef554c705 100644 --- a/samples/html/zip/zip_vc7.vcproj +++ b/samples/html/zip/zip_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj index ef4f620f13..76b31672fa 100644 --- a/samples/internat/internat_vc7.vcproj +++ b/samples/internat/internat_vc7.vcproj @@ -1,7 +1,7 @@ @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/ipc/ipc_vc7_ipcserver.vcproj b/samples/ipc/ipc_vc7_ipcserver.vcproj index 12ca976911..40ea834cb2 100644 --- a/samples/ipc/ipc_vc7_ipcserver.vcproj +++ b/samples/ipc/ipc_vc7_ipcserver.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj index ec9ecb1e3a..2fbfc83c60 100644 --- a/samples/ipc/ipc_vc8_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj index 8a03d56ea2..265cad9ef0 100644 --- a/samples/ipc/ipc_vc8_ipcserver.vcproj +++ b/samples/ipc/ipc_vc8_ipcserver.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/ipc/ipc_vc9_baseipcclient.vcproj b/samples/ipc/ipc_vc9_baseipcclient.vcproj index 89642df724..905c71b9f0 100644 --- a/samples/ipc/ipc_vc9_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc9_baseipcclient.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/ipc/ipc_vc9_ipcserver.vcproj b/samples/ipc/ipc_vc9_ipcserver.vcproj index 861ea6e8bd..1149f4d9dc 100644 --- a/samples/ipc/ipc_vc9_ipcserver.vcproj +++ b/samples/ipc/ipc_vc9_ipcserver.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc index 0d11dd5f80..5dba2e2fdb 100644 --- a/samples/ipc/makefile.bcc +++ b/samples/ipc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index ab5d24b2bf..324435b035 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx index e0bbf05182..b0dccb50ac 100644 --- a/samples/ipc/makefile.unx +++ b/samples/ipc/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -113,16 +113,16 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) ipcclient: $(IPCCLIENT_OBJECTS) - $(CXX) -o $@ $(IPCCLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) + $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` ipcserver: $(IPCSERVER_OBJECTS) - $(CXX) -o $@ $(IPCSERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` $(LDFLAGS) + $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,net,base` baseipcclient: $(BASEIPCCLIENT_OBJECTS) - $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) + $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` baseipcserver: $(BASEIPCSERVER_OBJECTS) - $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` $(LDFLAGS) + $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs net,base` ipcclient_client.o: ./client.cpp $(CXX) -c -o $@ $(IPCCLIENT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 97e86b4a34..eafd378abc 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index 2f2ffe6e9f..36b99123a7 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 37c72ccb0d..4dd8c45345 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj index 4255d36114..132bac564c 100644 --- a/samples/joytest/joytest_vc7.vcproj +++ b/samples/joytest/joytest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 478f9c387a..2e47b2359e 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj index ea15b61603..3f87882297 100644 --- a/samples/keyboard/keyboard_vc7.vcproj +++ b/samples/keyboard/keyboard_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index dd8a993181..efdff0101c 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj index ca4fd914b3..e8679a8c7c 100644 --- a/samples/layout/layout_vc7.vcproj +++ b/samples/layout/layout_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index f5d970639a..67c837ef08 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj index f18cdbe8c6..5ef2e3c20d 100644 --- a/samples/listctrl/listctrl_vc7.vcproj +++ b/samples/listctrl/listctrl_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/makefile.bcc b/samples/makefile.bcc index c78943370d..8a5b492005 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.gcc b/samples/makefile.gcc index b676a27c07..121b3b4363 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.vc b/samples/makefile.vc index a91053a01e..cc02b95438 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.wat b/samples/makefile.wat index 61b06d4b6d..0bcb7b0581 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 45833f9cf1..01f36befda 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 0f4da214fc..39ec259f4f 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index eba9cee7cf..e74967c431 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index cdb59461ca..056d23e9df 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) mdi: $(MDI_OBJECTS) - $(CXX) -o $@ $(MDI_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` mdi_mdi.o: ./mdi.cpp $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index f9e95ccbfc..13fe0e419d 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index 664919d760..7e43a49e03 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj index a8e8fb8825..031b021259 100644 --- a/samples/mdi/mdi_vc7.vcproj +++ b/samples/mdi/mdi_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/mediaplayer/mediaplayer_vc7.vcproj b/samples/mediaplayer/mediaplayer_vc7.vcproj index a290d62022..12a2aa41d9 100644 --- a/samples/mediaplayer/mediaplayer_vc7.vcproj +++ b/samples/mediaplayer/mediaplayer_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/mediaplayer/mediaplayer_vc8.vcproj b/samples/mediaplayer/mediaplayer_vc8.vcproj index c1885be7d2..e8d9dac81c 100644 --- a/samples/mediaplayer/mediaplayer_vc8.vcproj +++ b/samples/mediaplayer/mediaplayer_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/mediaplayer/mediaplayer_vc9.vcproj b/samples/mediaplayer/mediaplayer_vc9.vcproj index f2a39ab0ed..acbc301dfc 100644 --- a/samples/mediaplayer/mediaplayer_vc9.vcproj +++ b/samples/mediaplayer/mediaplayer_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 93e6f73c1b..41bd2447a3 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index ada269c972..fc97e61566 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index 7e3d4ce0cb..fe19b07d67 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx index c4e4ea45f9..7f9c5a8320 100644 --- a/samples/memcheck/makefile.unx +++ b/samples/memcheck/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) memcheck: $(MEMCHECK_OBJECTS) - $(CXX) -o $@ $(MEMCHECK_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` memcheck_memcheck.o: ./memcheck.cpp $(CXX) -c -o $@ $(MEMCHECK_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index ae07ffede4..6eddb55157 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index 293889b851..2edb2b768a 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj index d8114181b5..09846c0459 100644 --- a/samples/memcheck/memcheck_vc7.vcproj +++ b/samples/memcheck/memcheck_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj index e165c12762..0b19a42c81 100644 --- a/samples/menu/menu_vc7.vcproj +++ b/samples/menu/menu_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj index 794185c8d0..72045a5c21 100644 --- a/samples/minimal/minimal_vc7.vcproj +++ b/samples/minimal/minimal_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/minimal/minimal_vc8.vcproj b/samples/minimal/minimal_vc8.vcproj index d114ec969e..aa1b46f816 100644 --- a/samples/minimal/minimal_vc8.vcproj +++ b/samples/minimal/minimal_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/minimal/minimal_vc9.vcproj b/samples/minimal/minimal_vc9.vcproj index 62492e3ac0..24ba4bfd65 100644 --- a/samples/minimal/minimal_vc9.vcproj +++ b/samples/minimal/minimal_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 5bef277448..e492384b07 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index e088acd384..45852a40d0 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index 7de91dff20..87c5e42ba0 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx index 63daea6737..8f18b1a620 100644 --- a/samples/nativdlg/makefile.unx +++ b/samples/nativdlg/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) nativdlg: $(NATIVDLG_OBJECTS) - $(CXX) -o $@ $(NATIVDLG_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` nativdlg_nativdlg.o: ./nativdlg.cpp $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 79b0312787..6a19e0bbf6 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index 562e49d2ca..9e22d62517 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj index 5176923d67..b5bfa061dd 100644 --- a/samples/nativdlg/nativdlg_vc7.vcproj +++ b/samples/nativdlg/nativdlg_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj index 85c921ade4..02ca18b5ca 100644 --- a/samples/notebook/notebook_vc7.vcproj +++ b/samples/notebook/notebook_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj index 676b15ade2..5addf89bfe 100644 --- a/samples/notebook/notebook_vc8.vcproj +++ b/samples/notebook/notebook_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/notebook/notebook_vc9.vcproj b/samples/notebook/notebook_vc9.vcproj index 5e1c82b597..e5cb72f996 100644 --- a/samples/notebook/notebook_vc9.vcproj +++ b/samples/notebook/notebook_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 51001fdcba..9202086a80 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc index 8283f7d6ac..9c61265bdc 100644 --- a/samples/oleauto/makefile.bcc +++ b/samples/oleauto/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index 4c21ab97bb..19d606fea5 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx index 67232049bd..968155946f 100644 --- a/samples/oleauto/makefile.unx +++ b/samples/oleauto/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) oleauto: $(OLEAUTO_OBJECTS) - $(CXX) -o $@ $(OLEAUTO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` oleauto_oleauto.o: ./oleauto.cpp $(CXX) -c -o $@ $(OLEAUTO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 093a619f3d..8ea3990e19 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 9d7ce51e28..1f70cc15cb 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj index fbfb2fa47c..2bbb572a74 100644 --- a/samples/oleauto/oleauto_vc7.vcproj +++ b/samples/oleauto/oleauto_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + + + + @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> + + + + @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> + + + + = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index c2d38ec9e3..f293a702b9 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 c589cb3a2d..81453d5894 100644 --- a/samples/opengl/isosurf/isosurf.dsp +++ b/samples/opengl/isosurf/isosurf.dsp @@ -259,6 +259,14 @@ SOURCE=.\isosurf.cpp SOURCE=.\..\..\..\samples\sample.rc # End Source File # End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\isosurf.h +# End Source File +# End Group # End Target # End Project diff --git a/samples/opengl/isosurf/isosurf_vc7.vcproj b/samples/opengl/isosurf/isosurf_vc7.vcproj index 9ed511f266..e7e06cd435 100644 --- a/samples/opengl/isosurf/isosurf_vc7.vcproj +++ b/samples/opengl/isosurf/isosurf_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + + + + + RelativePath="..\..\..\samples\sample.rc"> diff --git a/samples/opengl/isosurf/isosurf_vc8.vcproj b/samples/opengl/isosurf/isosurf_vc8.vcproj index 2034949344..02e9324a8f 100644 --- a/samples/opengl/isosurf/isosurf_vc8.vcproj +++ b/samples/opengl/isosurf/isosurf_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> + + + + diff --git a/samples/opengl/isosurf/isosurf_vc9.vcproj b/samples/opengl/isosurf/isosurf_vc9.vcproj index 32b76f73c5..92935efe20 100644 --- a/samples/opengl/isosurf/isosurf_vc9.vcproj +++ b/samples/opengl/isosurf/isosurf_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> + + + + diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index 8370223932..aca1a86425 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc index 8de22e9c64..1b35dbecff 100644 --- a/samples/opengl/isosurf/makefile.gcc +++ b/samples/opengl/isosurf/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx index b52d2d7d7c..130332d83a 100644 --- a/samples/opengl/isosurf/makefile.unx +++ b/samples/opengl/isosurf/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) isosurf: $(ISOSURF_OBJECTS) - $(CXX) -o $@ $(ISOSURF_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` $(LDFLAGS) + $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` isosurf_isosurf.o: ./isosurf.cpp $(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index 33bedeaf03..d428e9e8fc 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 2f25d8b135..64d5ad9528 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc index ce01f1b172..4417a33d7e 100644 --- a/samples/opengl/makefile.bcc +++ b/samples/opengl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc index 8d8e70116b..dd932b0b1a 100644 --- a/samples/opengl/makefile.gcc +++ b/samples/opengl/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.unx b/samples/opengl/makefile.unx index 1c9cdd56a7..3402cd769d 100644 --- a/samples/opengl/makefile.unx +++ b/samples/opengl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 44ba17f3cc..ab4eb7e7dd 100644 --- a/samples/opengl/makefile.vc +++ b/samples/opengl/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat index ac63e778ac..be2201372b 100644 --- a/samples/opengl/makefile.wat +++ b/samples/opengl/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index ea0c71dd52..4fe90fa349 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 fc58c15646..496649eb3c 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index e8490bf049..03ca055ed7 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index 05d8fcfc45..eb3c5535ac 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -108,7 +108,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) penguin: $(PENGUIN_OBJECTS) - $(CXX) -o $@ $(PENGUIN_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` $(LDFLAGS) + $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs gl,core,base` penguin_penguin.o: ./penguin.cpp $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index 49a3d26154..9d0ce6e193 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index d359d4672f..250ec04261 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp index d6134cf870..5db5fe979a 100644 --- a/samples/opengl/penguin/penguin.dsp +++ b/samples/opengl/penguin/penguin.dsp @@ -267,6 +267,22 @@ SOURCE=.\penguin.rc SOURCE=.\trackball.c # End Source File # End Group +# Begin Group "Header Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\dxfrenderer.h +# End Source File +# Begin Source File + +SOURCE=.\penguin.h +# End Source File +# Begin Source File + +SOURCE=.\trackball.h +# End Source File +# End Group # End Target # End Project diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj index 62546b44ec..4ad188895c 100644 --- a/samples/opengl/penguin/penguin_vc7.vcproj +++ b/samples/opengl/penguin/penguin_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + + + + + + + + @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> + + + + + + + + @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> + + + + + + + + = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj index d46b426782..d7adbe12f6 100644 --- a/samples/ownerdrw/ownerdrw_vc7.vcproj +++ b/samples/ownerdrw/ownerdrw_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/popup/popup_vc7.vcproj b/samples/popup/popup_vc7.vcproj index 0542eace91..492a00bb98 100644 --- a/samples/popup/popup_vc7.vcproj +++ b/samples/popup/popup_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/popup/popup_vc8.vcproj b/samples/popup/popup_vc8.vcproj index ef46016cad..0acc088127 100644 --- a/samples/popup/popup_vc8.vcproj +++ b/samples/popup/popup_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/popup/popup_vc9.vcproj b/samples/popup/popup_vc9.vcproj index 2968c77fea..c5a6a08e2e 100644 --- a/samples/popup/popup_vc9.vcproj +++ b/samples/popup/popup_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 0eb0d8d176..fe242f08c0 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc index 80614211f0..ce8e3fa47a 100644 --- a/samples/power/makefile.bcc +++ b/samples/power/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc index 92a19994a6..355ec44b45 100644 --- a/samples/power/makefile.gcc +++ b/samples/power/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx index bb95468c5b..3f491cdabe 100644 --- a/samples/power/makefile.unx +++ b/samples/power/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) power: $(POWER_OBJECTS) - $(CXX) -o $@ $(POWER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(POWER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` power_power.o: ./power.cpp $(CXX) -c -o $@ $(POWER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 9984479bd7..bcbd7f5a84 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index b3a65d0ed5..3ee7497fc1 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/power/power_vc7.vcproj b/samples/power/power_vc7.vcproj index 6251f9fb4d..86b4a71a4e 100644 --- a/samples/power/power_vc7.vcproj +++ b/samples/power/power_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/power/power_vc8.vcproj b/samples/power/power_vc8.vcproj index ee63c2b954..55abb64c93 100644 --- a/samples/power/power_vc8.vcproj +++ b/samples/power/power_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/power/power_vc9.vcproj b/samples/power/power_vc9.vcproj index 475434e22c..52365de466 100644 --- a/samples/power/power_vc9.vcproj +++ b/samples/power/power_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index f87eae5f93..bd34c5f08d 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index 6b5e5ee125..a1adfe7893 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index 2dfc982659..d5859f7c6c 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx index 8e27f95075..e9b628f9ba 100644 --- a/samples/printing/makefile.unx +++ b/samples/printing/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) printing: $(PRINTING_OBJECTS) - $(CXX) -o $@ $(PRINTING_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` printing_printing.o: ./printing.cpp $(CXX) -c -o $@ $(PRINTING_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index 0e3a7e8704..c425b98138 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index b621bbc1b7..954364114d 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj index 020b66c65b..6ba10810eb 100644 --- a/samples/printing/printing_vc7.vcproj +++ b/samples/printing/printing_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj index df75ccd4cb..5ce327ae8a 100644 --- a/samples/propgrid/propgrid_vc7.vcproj +++ b/samples/propgrid/propgrid_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj index ecccd480b9..ab8c56fa41 100644 --- a/samples/propgrid/propgrid_vc8.vcproj +++ b/samples/propgrid/propgrid_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/propgrid/propgrid_vc9.vcproj b/samples/propgrid/propgrid_vc9.vcproj index 054c996e2d..492f39df15 100644 --- a/samples/propgrid/propgrid_vc9.vcproj +++ b/samples/propgrid/propgrid_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 693188bd8c..f127f0c65c 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc index 829dee0439..eaa3944b78 100644 --- a/samples/regtest/makefile.bcc +++ b/samples/regtest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index e069ff8a55..2f43352b71 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx index eadb48580f..229c50e832 100644 --- a/samples/regtest/makefile.unx +++ b/samples/regtest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) regtest: $(REGTEST_OBJECTS) - $(CXX) -o $@ $(REGTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` regtest_regtest.o: ./regtest.cpp $(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 69e1e8481e..2a9d708c3c 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index 1436f4296c..66ea0d1f41 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/regtest/regtest_vc7.vcproj b/samples/regtest/regtest_vc7.vcproj index e3b5d73811..6733ac3400 100644 --- a/samples/regtest/regtest_vc7.vcproj +++ b/samples/regtest/regtest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj index 60ade9b03b..0afa1eac80 100644 --- a/samples/render/render_vc7_renddll.vcproj +++ b/samples/render/render_vc7_renddll.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj index 1f277d6064..57ffb9f5c7 100644 --- a/samples/render/render_vc8_renddll.vcproj +++ b/samples/render/render_vc8_renddll.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/render/render_vc9_renddll.vcproj b/samples/render/render_vc9_renddll.vcproj index 64ca2665da..916635739f 100644 --- a/samples/render/render_vc9_renddll.vcproj +++ b/samples/render/render_vc9_renddll.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index aa9301c77e..f732808854 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc index fe08ec885d..c428f426bf 100644 --- a/samples/richtext/makefile.bcc +++ b/samples/richtext/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc index 72ccd8531a..038eccac1c 100644 --- a/samples/richtext/makefile.gcc +++ b/samples/richtext/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx index e20cd5fbb8..b98ec3dc82 100644 --- a/samples/richtext/makefile.unx +++ b/samples/richtext/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) richtext: $(RICHTEXT_OBJECTS) - $(CXX) -o $@ $(RICHTEXT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs richtext,adv,html,core,xml,base` $(LDFLAGS) + $(CXX) -o $@ $(RICHTEXT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs richtext,adv,html,core,xml,base` richtext_richtext.o: ./richtext.cpp $(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index 63bb10e699..df814638d2 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index 77eee969b2..7ff5b48800 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/richtext/richtext_vc7.vcproj b/samples/richtext/richtext_vc7.vcproj index 4bd5929ce4..8f81f02a00 100644 --- a/samples/richtext/richtext_vc7.vcproj +++ b/samples/richtext/richtext_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/richtext/richtext_vc8.vcproj b/samples/richtext/richtext_vc8.vcproj index d20eebf893..4d43b9599b 100644 --- a/samples/richtext/richtext_vc8.vcproj +++ b/samples/richtext/richtext_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/richtext/richtext_vc9.vcproj b/samples/richtext/richtext_vc9.vcproj index ed8206b561..377c87b8ed 100644 --- a/samples/richtext/richtext_vc9.vcproj +++ b/samples/richtext/richtext_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index d04ee25349..a79a2ba7a4 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index d7c3040ae2..afe40b6874 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index 7b726d8b4c..a5aca95299 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx index 1a8a188989..d0b0b796e7 100644 --- a/samples/sashtest/makefile.unx +++ b/samples/sashtest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) sashtest: $(SASHTEST_OBJECTS) - $(CXX) -o $@ $(SASHTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` sashtest_sashtest.o: ./sashtest.cpp $(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index b1afd2b32d..5c701a914c 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 995d3ecdaa..ee3feb15a4 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj index d4390be186..4bc8da5c7d 100644 --- a/samples/sashtest/sashtest_vc7.vcproj +++ b/samples/sashtest/sashtest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj index 03643637c1..4b8d0890c5 100644 --- a/samples/scroll/scroll_vc7.vcproj +++ b/samples/scroll/scroll_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj index 7a05f8b2ef..f0d76378db 100644 --- a/samples/shaped/shaped_vc7.vcproj +++ b/samples/shaped/shaped_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/sockets/sockets_vc7_baseclient.vcproj b/samples/sockets/sockets_vc7_baseclient.vcproj index 8b8e23817c..81eaea96a7 100644 --- a/samples/sockets/sockets_vc7_baseclient.vcproj +++ b/samples/sockets/sockets_vc7_baseclient.vcproj @@ -1,8 +1,8 @@ @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/sound/sound_vc7.vcproj b/samples/sound/sound_vc7.vcproj index a7445b246a..e45b1b3858 100644 --- a/samples/sound/sound_vc7.vcproj +++ b/samples/sound/sound_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/splash/splash_vc7.vcproj b/samples/splash/splash_vc7.vcproj index b2be6aee34..9ed2773946 100644 --- a/samples/splash/splash_vc7.vcproj +++ b/samples/splash/splash_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/splash/splash_vc8.vcproj b/samples/splash/splash_vc8.vcproj index 39e276c8ab..901db18f30 100644 --- a/samples/splash/splash_vc8.vcproj +++ b/samples/splash/splash_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/splash/splash_vc9.vcproj b/samples/splash/splash_vc9.vcproj index c34aacb3b8..a660da90f1 100644 --- a/samples/splash/splash_vc9.vcproj +++ b/samples/splash/splash_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 2633552220..3f3d734d7c 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index bb107736a9..3749dabddb 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index 5662b0621d..544436ea20 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx index 095f5e8eb5..003a0a6f38 100644 --- a/samples/splitter/makefile.unx +++ b/samples/splitter/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) splitter: $(SPLITTER_OBJECTS) - $(CXX) -o $@ $(SPLITTER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` splitter_splitter.o: ./splitter.cpp $(CXX) -c -o $@ $(SPLITTER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index 9a7cf6f322..3e5ce1102c 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index 4000458e61..2109b83d06 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj index 498b7dedbd..e481a84ab3 100644 --- a/samples/splitter/splitter_vc7.vcproj +++ b/samples/splitter/splitter_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj index 344bda77a0..e4f02ca2b3 100644 --- a/samples/statbar/statbar_vc7.vcproj +++ b/samples/statbar/statbar_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj index fbb44e99fb..7620532900 100644 --- a/samples/stc/stctest_vc7.vcproj +++ b/samples/stc/stctest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj index 2e5c3f66e8..cad2a4c162 100644 --- a/samples/stc/stctest_vc8.vcproj +++ b/samples/stc/stctest_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj index 87d2b07f14..5c251ddc3d 100644 --- a/samples/stc/stctest_vc9.vcproj +++ b/samples/stc/stctest_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 0b1d68bc25..ae1bd9b293 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index 4d454a9bd1..ba5e9f1b76 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index 77df163b95..1dbaa4ba07 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx index f642c1c23a..a2032a9b5c 100644 --- a/samples/svg/makefile.unx +++ b/samples/svg/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) svgtest: $(SVGTEST_OBJECTS) - $(CXX) -o $@ $(SVGTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` svgtest_svgtest.o: ./svgtest.cpp $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index 5b8f707bdd..66adc7aa0f 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index 7fd2ce4b53..412db410db 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/svg/svgtest_vc7.vcproj b/samples/svg/svgtest_vc7.vcproj index 3921d165c9..6c71d0bfc1 100644 --- a/samples/svg/svgtest_vc7.vcproj +++ b/samples/svg/svgtest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/svg/svgtest_vc8.vcproj b/samples/svg/svgtest_vc8.vcproj index 227b055a44..4cf2e449b1 100644 --- a/samples/svg/svgtest_vc8.vcproj +++ b/samples/svg/svgtest_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/svg/svgtest_vc9.vcproj b/samples/svg/svgtest_vc9.vcproj index 2ec6d8198a..fd920d45ff 100644 --- a/samples/svg/svgtest_vc9.vcproj +++ b/samples/svg/svgtest_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 1ea10cfd4c..65013b2a2d 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc index 179f87b1c5..9fff92751e 100644 --- a/samples/taborder/makefile.bcc +++ b/samples/taborder/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc index 195bbb7991..9dc9bdc77b 100644 --- a/samples/taborder/makefile.gcc +++ b/samples/taborder/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx index f5c9d3d6d5..1befed3990 100644 --- a/samples/taborder/makefile.unx +++ b/samples/taborder/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) taborder: $(TABORDER_OBJECTS) - $(CXX) -o $@ $(TABORDER_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(TABORDER_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` taborder_taborder.o: ./taborder.cpp $(CXX) -c -o $@ $(TABORDER_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index ec9c286ebe..f46bcfc751 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat index f620ac79a9..26437a5548 100644 --- a/samples/taborder/makefile.wat +++ b/samples/taborder/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/taborder/taborder_vc7.vcproj b/samples/taborder/taborder_vc7.vcproj index 6bdaad9812..b13770292a 100644 --- a/samples/taborder/taborder_vc7.vcproj +++ b/samples/taborder/taborder_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/taborder/taborder_vc8.vcproj b/samples/taborder/taborder_vc8.vcproj index 2217e55f94..fa17a237b1 100644 --- a/samples/taborder/taborder_vc8.vcproj +++ b/samples/taborder/taborder_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/taborder/taborder_vc9.vcproj b/samples/taborder/taborder_vc9.vcproj index 2257e7ca77..a7baf93122 100644 --- a/samples/taborder/taborder_vc9.vcproj +++ b/samples/taborder/taborder_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 1fe446501f..0f71a6aab3 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index a033621dab..b9121f015c 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index d671dce30a..5ac46c3816 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx index 9443c6ad02..c02b205c0e 100644 --- a/samples/taskbar/makefile.unx +++ b/samples/taskbar/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) taskbar: $(TASKBAR_OBJECTS) - $(CXX) -o $@ $(TASKBAR_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` taskbar_tbtest.o: ./tbtest.cpp $(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index 7122cb4327..ac0ba4c38d 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index ec14ef5429..96fb191ca0 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/taskbar/taskbar_vc7.vcproj b/samples/taskbar/taskbar_vc7.vcproj index 2f41d56997..7cb342f9b4 100644 --- a/samples/taskbar/taskbar_vc7.vcproj +++ b/samples/taskbar/taskbar_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/taskbar/taskbar_vc8.vcproj b/samples/taskbar/taskbar_vc8.vcproj index 882ebc1f59..0903485af3 100644 --- a/samples/taskbar/taskbar_vc8.vcproj +++ b/samples/taskbar/taskbar_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/taskbar/taskbar_vc9.vcproj b/samples/taskbar/taskbar_vc9.vcproj index 0baa4e8324..392a1ecefb 100644 --- a/samples/taskbar/taskbar_vc9.vcproj +++ b/samples/taskbar/taskbar_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 8761ef6da3..daa499e81b 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index 1d3ee11fec..888abcd963 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 9fb68ea886..e2a235d5f5 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx index 95310ca023..cffe3b808b 100644 --- a/samples/text/makefile.unx +++ b/samples/text/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) text: $(TEXT_OBJECTS) - $(CXX) -o $@ $(TEXT_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` text_text.o: ./text.cpp $(CXX) -c -o $@ $(TEXT_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index 1b84b3c714..a37e620f5f 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index 7522bca0f3..e9aa689925 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/text/text_vc7.vcproj b/samples/text/text_vc7.vcproj index 9b950d6bba..0166dfac64 100644 --- a/samples/text/text_vc7.vcproj +++ b/samples/text/text_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/thread/thread_vc7.vcproj b/samples/thread/thread_vc7.vcproj index b940633b3f..1bc32cd36a 100644 --- a/samples/thread/thread_vc7.vcproj +++ b/samples/thread/thread_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/toolbar/toolbar_vc7.vcproj b/samples/toolbar/toolbar_vc7.vcproj index 7db37573ce..7fb4ed6e27 100644 --- a/samples/toolbar/toolbar_vc7.vcproj +++ b/samples/toolbar/toolbar_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/treectrl/treectrl_vc7.vcproj b/samples/treectrl/treectrl_vc7.vcproj index 82f81d7bee..4720ab94aa 100644 --- a/samples/treectrl/treectrl_vc7.vcproj +++ b/samples/treectrl/treectrl_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/treectrl/treectrl_vc8.vcproj b/samples/treectrl/treectrl_vc8.vcproj index 74b175dc3b..80008cd964 100644 --- a/samples/treectrl/treectrl_vc8.vcproj +++ b/samples/treectrl/treectrl_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/treectrl/treectrl_vc9.vcproj b/samples/treectrl/treectrl_vc9.vcproj index 486ece4785..fc93e082fc 100644 --- a/samples/treectrl/treectrl_vc9.vcproj +++ b/samples/treectrl/treectrl_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 9f8b672eed..86d796b564 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 9c1006d6cb..452de84f50 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index b2cc465517..5b6dffaa01 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx index 61bea24c6a..42ef4e45d1 100644 --- a/samples/typetest/makefile.unx +++ b/samples/typetest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) typetest: $(TYPETEST_OBJECTS) - $(CXX) -o $@ $(TYPETEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` typetest_typetest.o: ./typetest.cpp $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 2109e851e7..a5f04acd19 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index 79966fc289..8a1f208e3a 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj index 4e2a31cf07..b55bdc47b1 100644 --- a/samples/typetest/typetest_vc7.vcproj +++ b/samples/typetest/typetest_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/validate/validate_vc7.vcproj b/samples/validate/validate_vc7.vcproj index 54aad14a87..53d1797f96 100644 --- a/samples/validate/validate_vc7.vcproj +++ b/samples/validate/validate_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/validate/validate_vc8.vcproj b/samples/validate/validate_vc8.vcproj index b964cfb2d4..843399a988 100644 --- a/samples/validate/validate_vc8.vcproj +++ b/samples/validate/validate_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/validate/validate_vc9.vcproj b/samples/validate/validate_vc9.vcproj index 2628a6b87f..7409eb2bb1 100644 --- a/samples/validate/validate_vc9.vcproj +++ b/samples/validate/validate_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index b344387cc8..53b207469b 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc index f69110c4ed..d88311376d 100644 --- a/samples/vscroll/makefile.bcc +++ b/samples/vscroll/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 60378ac173..30995a9f1d 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx index b5f185b33b..98a0169e92 100644 --- a/samples/vscroll/makefile.unx +++ b/samples/vscroll/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) vstest: $(VSTEST_OBJECTS) - $(CXX) -o $@ $(VSTEST_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) + $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` vstest_vstest.o: ./vstest.cpp $(CXX) -c -o $@ $(VSTEST_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index 2c8cb5a3b2..5d4799bbb9 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index f751ee2c1e..ac3c83e100 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/vscroll/vscroll_vc7.vcproj b/samples/vscroll/vscroll_vc7.vcproj index ba7781f67e..a301ba0799 100644 --- a/samples/vscroll/vscroll_vc7.vcproj +++ b/samples/vscroll/vscroll_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/vscroll/vscroll_vc8.vcproj b/samples/vscroll/vscroll_vc8.vcproj index 376795e73c..fa2bd1020d 100644 --- a/samples/vscroll/vscroll_vc8.vcproj +++ b/samples/vscroll/vscroll_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/vscroll/vscroll_vc9.vcproj b/samples/vscroll/vscroll_vc9.vcproj index 3e1aa4e7e4..6f2956fa54 100644 --- a/samples/vscroll/vscroll_vc9.vcproj +++ b/samples/vscroll/vscroll_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index a4114b93da..90f7f03a53 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 7fbea491e9..e1482accf4 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index 37027f8824..d5f5120672 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx index 3cead1c77c..f04b0dc67a 100644 --- a/samples/widgets/makefile.unx +++ b/samples/widgets/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -125,7 +125,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) widgets: $(WIDGETS_OBJECTS) - $(CXX) -o $@ $(WIDGETS_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` widgets_bmpcombobox.o: ./bmpcombobox.cpp $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index 8dee1afb72..42f447e0f9 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index ffab8006c2..cad2396727 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/widgets/widgets_vc7.vcproj b/samples/widgets/widgets_vc7.vcproj index 5ba82429c1..b5d239bc13 100644 --- a/samples/widgets/widgets_vc7.vcproj +++ b/samples/widgets/widgets_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\sample.rc"> diff --git a/samples/widgets/widgets_vc8.vcproj b/samples/widgets/widgets_vc8.vcproj index 71814fa1ff..880f08d776 100644 --- a/samples/widgets/widgets_vc8.vcproj +++ b/samples/widgets/widgets_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/widgets/widgets_vc9.vcproj b/samples/widgets/widgets_vc9.vcproj index a08d98151a..8dfd23e321 100644 --- a/samples/widgets/widgets_vc9.vcproj +++ b/samples/widgets/widgets_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 97153f6850..3d0e5351e1 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index e3a8f4ba0c..e160dd3dae 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index ee2261b0a9..6345b199ea 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx index 8d8baeb74c..96823a4f3c 100644 --- a/samples/wizard/makefile.unx +++ b/samples/wizard/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -98,7 +98,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) wizard: $(WIZARD_OBJECTS) - $(CXX) -o $@ $(WIZARD_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` $(LDFLAGS) + $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base` wizard_wizard.o: ./wizard.cpp $(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index ae7859dad1..052a7121b5 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index d053ddf4f9..abb4b10fc9 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/wizard/wizard_vc7.vcproj b/samples/wizard/wizard_vc7.vcproj index 0c046b4dbc..a1db532ef9 100644 --- a/samples/wizard/wizard_vc7.vcproj +++ b/samples/wizard/wizard_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/wrapsizer/wrapsizer_vc7.vcproj b/samples/wrapsizer/wrapsizer_vc7.vcproj index 861e947341..713bb0d8ef 100644 --- a/samples/wrapsizer/wrapsizer_vc7.vcproj +++ b/samples/wrapsizer/wrapsizer_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + RelativePath="..\..\samples\sample.rc"> diff --git a/samples/wrapsizer/wrapsizer_vc8.vcproj b/samples/wrapsizer/wrapsizer_vc8.vcproj index 5d5bd3ee32..898c3ed4ed 100644 --- a/samples/wrapsizer/wrapsizer_vc8.vcproj +++ b/samples/wrapsizer/wrapsizer_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/samples/wrapsizer/wrapsizer_vc9.vcproj b/samples/wrapsizer/wrapsizer_vc9.vcproj index 067c1941ae..fae22940e3 100644 --- a/samples/wrapsizer/wrapsizer_vc9.vcproj +++ b/samples/wrapsizer/wrapsizer_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index ceff2a67ed..302f2ea83a 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index 5b2412f83e..36f09b580b 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index ffb9611a97..4f7befdaba 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx index b91d4b319c..00942837c9 100644 --- a/samples/xrc/makefile.unx +++ b/samples/xrc/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -101,7 +101,7 @@ test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) xrcdemo: $(XRCDEMO_OBJECTS) - $(CXX) -o $@ $(XRCDEMO_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xrc,html,adv,core,xml,base` $(LDFLAGS) + $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs xrc,html,adv,core,xml,base` xrcdemo_xrcdemo.o: ./xrcdemo.cpp $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $(CPPDEPS) $< diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index e97f43f788..cb7dc37ff4 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 121f590870..5f41810aa9 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj index eb58085f8f..16242e2a3f 100644 --- a/samples/xrc/xrcdemo_vc7.vcproj +++ b/samples/xrc/xrcdemo_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> + ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}" + > + Name="Win32" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswunivudll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswunivuddll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswudll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswuddll\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswunivu\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswunivud\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswu\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + + Name="VCPreLinkEventTool" + /> - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + OutputFile="vc_mswud\bench.bsc" + SuppressStartupBanner="true" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> @@ -524,27 +785,35 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\bench.cpp" + > + RelativePath=".\htmlparser\htmlpars.cpp" + > + RelativePath=".\htmlparser\htmltag.cpp" + > + RelativePath=".\ipcclient.cpp" + > + RelativePath=".\mbconv.cpp" + > + RelativePath=".\strings.cpp" + > + RelativePath=".\tls.cpp" + > diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index de36629a8e..93f304d8d7 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index f6e914824f..53a014ad77 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index abd82a4b3d..050576d18a 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index 803a2bcb70..8fd23c5331 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 36c8814aca..d779b0aa08 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 9aa6a4e47b..97e84a4a83 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.vc b/tests/makefile.vc index 8b4e788b87..089f43c016 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.wat b/tests/makefile.wat index 7713c06740..4aa291b374 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/tests/test_vc7_printfbench.vcproj b/tests/test_vc7_printfbench.vcproj index ca4442cb31..4c4f8dbee6 100644 --- a/tests/test_vc7_printfbench.vcproj +++ b/tests/test_vc7_printfbench.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index 2c0934a59d..0263ed5825 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index 4f385d4a89..04de9deff2 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -1,8 +1,8 @@ @@ -17,27 +17,29 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE" + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/> + AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/> + Name="Debug|Win32"> + Name="Release|Win32"> + Name="Universal Debug|Win32"> + Name="Universal Release|Win32"> + Name="DLL Debug|Win32"> + Name="DLL Release|Win32"> + Name="DLL Universal Debug|Win32"> + Name="DLL Universal Release|Win32"> @@ -678,7 +686,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\samples\sample.rc"> diff --git a/tests/test_vc8_printfbench.vcproj b/tests/test_vc8_printfbench.vcproj index c74a8c5852..7ff0d47fd9 100644 --- a/tests/test_vc8_printfbench.vcproj +++ b/tests/test_vc8_printfbench.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> @@ -22,9 +22,9 @@ @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> @@ -22,9 +22,9 @@ @@ -101,7 +105,7 @@ /> @@ -200,7 +202,7 @@ /> @@ -296,7 +302,7 @@ /> @@ -395,7 +399,7 @@ /> @@ -491,7 +499,7 @@ /> @@ -590,7 +596,7 @@ /> @@ -686,7 +696,7 @@ /> @@ -785,7 +793,7 @@ /> diff --git a/tests/test_vc9.sln b/tests/test_vc9.sln index 9e08286566..d4163d3616 100644 --- a/tests/test_vc9.sln +++ b/tests/test_vc9.sln @@ -8,64 +8,64 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printfbench", "test_vc9_pri EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32 - {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.ActiveCfg = Debug|Win32 {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Debug|Win32.Build.0 = Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32 - {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.ActiveCfg = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Release|Win32.Build.0 = Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {2F45723C-ED6B-5F60-8BFF-6B3609464A7B}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.ActiveCfg = Debug|Win32 {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Debug|Win32.Build.0 = Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32 - {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.ActiveCfg = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Release|Win32.Build.0 = Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {9BB295D9-A6AA-510D-AA0D-9375B5D91025}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.ActiveCfg = Debug|Win32 {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Debug|Win32.Build.0 = Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.ActiveCfg = Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Release|Win32.Build.0 = Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {568BD6DD-9BBE-583D-9BCE-08F5755A6015}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/test_vc9_printfbench.vcproj b/tests/test_vc9_printfbench.vcproj index f076ccfca9..2f5704a9c3 100644 --- a/tests/test_vc9_printfbench.vcproj +++ b/tests/test_vc9_printfbench.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> @@ -22,9 +22,9 @@ @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> @@ -22,9 +22,9 @@ @@ -101,7 +104,7 @@ /> @@ -196,7 +198,7 @@ /> @@ -289,7 +294,7 @@ /> @@ -384,7 +388,7 @@ /> @@ -477,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +674,7 @@ /> @@ -760,7 +768,7 @@ /> diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 7539d0a98d..2fbc3995f6 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj index 510a5b9982..5f7eddcc8b 100644 --- a/utils/emulator/src/emulator_vc7.vcproj +++ b/utils/emulator/src/emulator_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + RelativePath="..\..\..\samples\sample.rc"> diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj index f9f5b91c1b..39ca6bce24 100644 --- a/utils/emulator/src/emulator_vc8.vcproj +++ b/utils/emulator/src/emulator_vc8.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> diff --git a/utils/emulator/src/emulator_vc9.sln b/utils/emulator/src/emulator_vc9.sln index 4e97314a57..98f0fc90ac 100644 --- a/utils/emulator/src/emulator_vc9.sln +++ b/utils/emulator/src/emulator_vc9.sln @@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxemulator", "emulator_vc9. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Release|Win32.ActiveCfg = Release|Win32 - {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Release|Win32.Build.0 = Release|Win32 {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Debug|Win32.ActiveCfg = Debug|Win32 {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Debug|Win32.Build.0 = Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Release|Win32.ActiveCfg = Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Release|Win32.Build.0 = Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {73B0C4D6-1F89-5DA8-A212-72D02E6E53C5}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/utils/emulator/src/emulator_vc9.vcproj b/utils/emulator/src/emulator_vc9.vcproj index 8b46628f5f..2545b58301 100644 --- a/utils/emulator/src/emulator_vc9.vcproj +++ b/utils/emulator/src/emulator_vc9.vcproj @@ -1,8 +1,8 @@ @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 700176eee5..e6d83b5de3 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index a5c51bcd31..30e0b8a764 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index 0c40fcc452..14704e8109 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index 08b8924e0e..0cda4ede8f 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index bcda53a709..1f1808d346 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj index f691d9a813..901b4a3a4e 100644 --- a/utils/helpview/src/helpview_vc7.vcproj +++ b/utils/helpview/src/helpview_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 1f9d7b7a68..d39bd8d177 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj index e9bff46fa0..42a085431a 100644 --- a/utils/hhp2cached/hhp2cached_vc7.vcproj +++ b/utils/hhp2cached/hhp2cached_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in index da3e81a280..397f0a2920 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/ifacecheck/src/ifacecheck_vc7.sln b/utils/ifacecheck/src/ifacecheck_vc7.sln index cad9c4052e..3717f70e84 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.sln +++ b/utils/ifacecheck/src/ifacecheck_vc7.sln @@ -3,32 +3,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.ActiveCfg = Release|Win32 - {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.Build.0 = Release|Win32 {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.ActiveCfg = Debug|Win32 {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Debug|Win32.Build.0 = Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.ActiveCfg = Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Release|Win32.Build.0 = Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {355B6651-9A8E-5D72-A3E9-DAB21650C0FC}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj index 61e6af1993..448644fe6a 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;."/> + + + + + + + + + + + + + + + @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in index f507c771a4..e938e9685b 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.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (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 53eeb53143..4fb5747c9b 100644 --- a/utils/screenshotgen/src/makefile.bcc +++ b/utils/screenshotgen/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc index ce603267f5..2a15ab0ab2 100644 --- a/utils/screenshotgen/src/makefile.gcc +++ b/utils/screenshotgen/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index 9e6b25e17a..3b710fe3fb 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat index cd7eede1d6..b99a6965b9 100644 --- a/utils/screenshotgen/src/makefile.wat +++ b/utils/screenshotgen/src/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/screenshotgen/src/screenshotgen_vc7.sln b/utils/screenshotgen/src/screenshotgen_vc7.sln index 05527113db..4359144bed 100644 --- a/utils/screenshotgen/src/screenshotgen_vc7.sln +++ b/utils/screenshotgen/src/screenshotgen_vc7.sln @@ -3,32 +3,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshot EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - DLL Universal Release|Win32 = DLL Universal Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Release|Win32 = Release|Win32 Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Universal Debug|Win32 = Universal Debug|Win32 + Universal Release|Win32 = Universal Release|Win32 + DLL Debug|Win32 = DLL Debug|Win32 + DLL Release|Win32 = DLL Release|Win32 + DLL Universal Debug|Win32 = DLL Universal Debug|Win32 + DLL Universal Release|Win32 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Release|Win32.Build.0 = Universal Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.ActiveCfg = Release|Win32 - {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.Build.0 = Release|Win32 {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.ActiveCfg = Debug|Win32 {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Debug|Win32.Build.0 = Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.ActiveCfg = Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Release|Win32.Build.0 = Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.Universal Release|Win32.Build.0 = Universal Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Release|Win32.Build.0 = DLL Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 + {65A1C4C8-E1D5-5972-8550-0F5631031FBB}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/utils/screenshotgen/src/screenshotgen_vc7.vcproj b/utils/screenshotgen/src/screenshotgen_vc7.vcproj index 1c809a32bc..1a4538f17a 100644 --- a/utils/screenshotgen/src/screenshotgen_vc7.vcproj +++ b/utils/screenshotgen/src/screenshotgen_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,24 +17,26 @@ + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"/> @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ /> = 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj index a3acfcdea9..dd14ce7355 100644 --- a/utils/wxrc/wxrc_vc7.vcproj +++ b/utils/wxrc/wxrc_vc7.vcproj @@ -1,8 +1,8 @@ @@ -17,70 +17,9 @@ - - - - - - - - - - - - - - - + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."/> + + + + + + + + + + + + + + + @@ -22,9 +22,9 @@ @@ -98,7 +102,7 @@ /> @@ -194,7 +196,7 @@ /> @@ -287,7 +293,7 @@ /> @@ -383,7 +387,7 @@ /> @@ -476,7 +484,7 @@ /> @@ -572,7 +578,7 @@ /> @@ -665,7 +675,7 @@ /> @@ -761,7 +769,7 @@ /> @@ -22,9 +22,9 @@ @@ -98,7 +101,7 @@ /> @@ -190,7 +192,7 @@ /> @@ -280,7 +285,7 @@ /> @@ -372,7 +376,7 @@ /> @@ -462,7 +469,7 @@ /> @@ -554,7 +560,7 @@ /> @@ -644,7 +653,7 @@ /> @@ -736,7 +744,7 @@ />