From a4830bb56087db30c534dc6937242b2260d0a9c8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 Jul 2013 12:41:02 +0000 Subject: [PATCH] Always add libwxscintilla in monolithic mode. The library was already present in the makefiles but came before the monolithic library itself, which broke the linking of the samples when using GNU ld as the dependent libraries must come after the libraries using them. Closes #13837. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/common.bkl | 5 +++++ demos/bombs/Makefile.in | 4 +++- demos/bombs/bombs_vc7.vcproj | 8 ++++---- demos/bombs/bombs_vc8.vcproj | 8 ++++---- demos/bombs/bombs_vc9.vcproj | 8 ++++---- demos/bombs/makefile.bcc | 5 ++++- demos/bombs/makefile.gcc | 5 ++++- demos/bombs/makefile.vc | 5 ++++- demos/bombs/makefile.wat | 6 +++++- demos/forty/Makefile.in | 4 +++- demos/forty/forty_vc7.vcproj | 8 ++++---- demos/forty/forty_vc8.vcproj | 8 ++++---- demos/forty/forty_vc9.vcproj | 8 ++++---- demos/forty/makefile.bcc | 5 ++++- demos/forty/makefile.gcc | 5 ++++- demos/forty/makefile.vc | 5 ++++- demos/forty/makefile.wat | 6 +++++- demos/fractal/Makefile.in | 4 +++- demos/fractal/fractal_vc7.vcproj | 8 ++++---- demos/fractal/fractal_vc8.vcproj | 8 ++++---- demos/fractal/fractal_vc9.vcproj | 8 ++++---- demos/fractal/makefile.bcc | 5 ++++- demos/fractal/makefile.gcc | 5 ++++- demos/fractal/makefile.vc | 5 ++++- demos/fractal/makefile.wat | 6 +++++- demos/life/Makefile.in | 4 +++- demos/life/life_vc7.vcproj | 8 ++++---- demos/life/life_vc8.vcproj | 8 ++++---- demos/life/life_vc9.vcproj | 8 ++++---- demos/life/makefile.bcc | 5 ++++- demos/life/makefile.gcc | 5 ++++- demos/life/makefile.vc | 5 ++++- demos/life/makefile.wat | 6 +++++- demos/poem/Makefile.in | 4 +++- demos/poem/makefile.bcc | 5 ++++- demos/poem/makefile.gcc | 5 ++++- demos/poem/makefile.vc | 5 ++++- demos/poem/makefile.wat | 6 +++++- demos/poem/poem_vc7.vcproj | 8 ++++---- demos/poem/poem_vc8.vcproj | 8 ++++---- demos/poem/poem_vc9.vcproj | 8 ++++---- samples/access/Makefile.in | 4 +++- samples/access/access_vc7.vcproj | 8 ++++---- samples/access/access_vc8.vcproj | 8 ++++---- samples/access/access_vc9.vcproj | 8 ++++---- samples/access/makefile.bcc | 5 ++++- samples/access/makefile.gcc | 5 ++++- samples/access/makefile.vc | 5 ++++- samples/access/makefile.wat | 6 +++++- samples/animate/Makefile.in | 4 +++- samples/animate/anitest_vc7.vcproj | 8 ++++---- samples/animate/anitest_vc8.vcproj | 8 ++++---- samples/animate/anitest_vc9.vcproj | 8 ++++---- samples/animate/makefile.bcc | 5 ++++- samples/animate/makefile.gcc | 5 ++++- samples/animate/makefile.vc | 5 ++++- samples/animate/makefile.wat | 6 +++++- samples/artprov/Makefile.in | 4 +++- samples/artprov/artprov_vc7.vcproj | 8 ++++---- samples/artprov/artprov_vc8.vcproj | 8 ++++---- samples/artprov/artprov_vc9.vcproj | 8 ++++---- samples/artprov/makefile.bcc | 5 ++++- samples/artprov/makefile.gcc | 5 ++++- samples/artprov/makefile.vc | 5 ++++- samples/artprov/makefile.wat | 6 +++++- samples/aui/Makefile.in | 4 +++- samples/aui/auidemo_vc7.vcproj | 8 ++++---- samples/aui/auidemo_vc8.vcproj | 8 ++++---- samples/aui/auidemo_vc9.vcproj | 8 ++++---- samples/aui/makefile.bcc | 5 ++++- samples/aui/makefile.gcc | 5 ++++- samples/aui/makefile.vc | 5 ++++- samples/aui/makefile.wat | 6 +++++- samples/calendar/Makefile.in | 4 +++- samples/calendar/calendar_vc7.vcproj | 8 ++++---- samples/calendar/calendar_vc8.vcproj | 8 ++++---- samples/calendar/calendar_vc9.vcproj | 8 ++++---- samples/calendar/makefile.bcc | 5 ++++- samples/calendar/makefile.gcc | 5 ++++- samples/calendar/makefile.vc | 5 ++++- samples/calendar/makefile.wat | 6 +++++- samples/caret/Makefile.in | 4 +++- samples/caret/caret_vc7.vcproj | 8 ++++---- samples/caret/caret_vc8.vcproj | 8 ++++---- samples/caret/caret_vc9.vcproj | 8 ++++---- samples/caret/makefile.bcc | 5 ++++- samples/caret/makefile.gcc | 5 ++++- samples/caret/makefile.vc | 5 ++++- samples/caret/makefile.wat | 6 +++++- samples/clipboard/Makefile.in | 4 +++- samples/clipboard/clipboard_vc7.vcproj | 8 ++++---- samples/clipboard/clipboard_vc8.vcproj | 8 ++++---- samples/clipboard/clipboard_vc9.vcproj | 8 ++++---- samples/clipboard/makefile.bcc | 5 ++++- samples/clipboard/makefile.gcc | 5 ++++- samples/clipboard/makefile.vc | 5 ++++- samples/clipboard/makefile.wat | 6 +++++- samples/collpane/Makefile.in | 4 +++- samples/collpane/collpane_vc7.vcproj | 8 ++++---- samples/collpane/collpane_vc8.vcproj | 8 ++++---- samples/collpane/collpane_vc9.vcproj | 8 ++++---- samples/collpane/makefile.bcc | 5 ++++- samples/collpane/makefile.gcc | 5 ++++- samples/collpane/makefile.vc | 5 ++++- samples/collpane/makefile.wat | 6 +++++- samples/combo/Makefile.in | 4 +++- samples/combo/combo_vc7.vcproj | 8 ++++---- samples/combo/combo_vc8.vcproj | 8 ++++---- samples/combo/combo_vc9.vcproj | 8 ++++---- samples/combo/makefile.bcc | 5 ++++- samples/combo/makefile.gcc | 5 ++++- samples/combo/makefile.vc | 5 ++++- samples/combo/makefile.wat | 6 +++++- samples/config/Makefile.in | 4 +++- samples/config/config_vc7.vcproj | 8 ++++---- samples/config/config_vc8.vcproj | 8 ++++---- samples/config/config_vc9.vcproj | 8 ++++---- samples/config/makefile.bcc | 5 ++++- samples/config/makefile.gcc | 5 ++++- samples/config/makefile.vc | 5 ++++- samples/config/makefile.wat | 6 +++++- samples/controls/Makefile.in | 4 +++- samples/controls/controls_vc7.vcproj | 8 ++++---- samples/controls/controls_vc8.vcproj | 8 ++++---- samples/controls/controls_vc9.vcproj | 8 ++++---- samples/controls/makefile.bcc | 5 ++++- samples/controls/makefile.gcc | 5 ++++- samples/controls/makefile.vc | 5 ++++- samples/controls/makefile.wat | 6 +++++- samples/dataview/Makefile.in | 4 +++- samples/dataview/dataview_vc7.vcproj | 8 ++++---- samples/dataview/dataview_vc8.vcproj | 8 ++++---- samples/dataview/dataview_vc9.vcproj | 8 ++++---- samples/dataview/makefile.bcc | 5 ++++- samples/dataview/makefile.gcc | 5 ++++- samples/dataview/makefile.vc | 5 ++++- samples/dataview/makefile.wat | 6 +++++- samples/debugrpt/Makefile.in | 4 +++- samples/debugrpt/debugrpt_vc7.vcproj | 8 ++++---- samples/debugrpt/debugrpt_vc8.vcproj | 8 ++++---- samples/debugrpt/debugrpt_vc9.vcproj | 8 ++++---- samples/debugrpt/makefile.bcc | 5 ++++- samples/debugrpt/makefile.gcc | 5 ++++- samples/debugrpt/makefile.vc | 5 ++++- samples/debugrpt/makefile.wat | 6 +++++- samples/dialogs/Makefile.in | 4 +++- samples/dialogs/dialogs_vc7.vcproj | 8 ++++---- samples/dialogs/dialogs_vc8.vcproj | 8 ++++---- samples/dialogs/dialogs_vc9.vcproj | 8 ++++---- samples/dialogs/makefile.bcc | 5 ++++- samples/dialogs/makefile.gcc | 5 ++++- samples/dialogs/makefile.vc | 5 ++++- samples/dialogs/makefile.wat | 6 +++++- samples/dialup/Makefile.in | 4 +++- samples/dialup/dialup_vc7.vcproj | 8 ++++---- samples/dialup/dialup_vc8.vcproj | 8 ++++---- samples/dialup/dialup_vc9.vcproj | 8 ++++---- samples/dialup/makefile.bcc | 5 ++++- samples/dialup/makefile.gcc | 5 ++++- samples/dialup/makefile.vc | 5 ++++- samples/dialup/makefile.wat | 6 +++++- samples/display/Makefile.in | 4 +++- samples/display/display_vc7.vcproj | 8 ++++---- samples/display/display_vc8.vcproj | 8 ++++---- samples/display/display_vc9.vcproj | 8 ++++---- samples/display/makefile.bcc | 5 ++++- samples/display/makefile.gcc | 5 ++++- samples/display/makefile.vc | 5 ++++- samples/display/makefile.wat | 6 +++++- samples/dll/Makefile.in | 6 ++++-- samples/dll/dll_vc7_my_dll.vcproj | 8 ++++---- samples/dll/dll_vc7_wx_exe.vcproj | 4 ++-- samples/dll/dll_vc8_my_dll.vcproj | 8 ++++---- samples/dll/dll_vc8_wx_exe.vcproj | 4 ++-- samples/dll/dll_vc9_my_dll.vcproj | 8 ++++---- samples/dll/dll_vc9_wx_exe.vcproj | 4 ++-- samples/dll/makefile.bcc | 7 +++++-- samples/dll/makefile.gcc | 7 +++++-- samples/dll/makefile.vc | 7 +++++-- samples/dll/makefile.wat | 8 ++++++-- samples/dnd/Makefile.in | 4 +++- samples/dnd/dnd_vc7.vcproj | 8 ++++---- samples/dnd/dnd_vc8.vcproj | 8 ++++---- samples/dnd/dnd_vc9.vcproj | 8 ++++---- samples/dnd/makefile.bcc | 5 ++++- samples/dnd/makefile.gcc | 5 ++++- samples/dnd/makefile.vc | 5 ++++- samples/dnd/makefile.wat | 6 +++++- samples/docview/Makefile.in | 4 +++- samples/docview/docview_vc7.vcproj | 8 ++++---- samples/docview/docview_vc8.vcproj | 8 ++++---- samples/docview/docview_vc9.vcproj | 8 ++++---- samples/docview/makefile.bcc | 5 ++++- samples/docview/makefile.gcc | 5 ++++- samples/docview/makefile.vc | 5 ++++- samples/docview/makefile.wat | 6 +++++- samples/dragimag/Makefile.in | 4 +++- samples/dragimag/dragimag_vc7.vcproj | 8 ++++---- samples/dragimag/dragimag_vc8.vcproj | 8 ++++---- samples/dragimag/dragimag_vc9.vcproj | 8 ++++---- samples/dragimag/makefile.bcc | 5 ++++- samples/dragimag/makefile.gcc | 5 ++++- samples/dragimag/makefile.vc | 5 ++++- samples/dragimag/makefile.wat | 6 +++++- samples/drawing/Makefile.in | 4 +++- samples/drawing/drawing_vc7.vcproj | 8 ++++---- samples/drawing/drawing_vc8.vcproj | 8 ++++---- samples/drawing/drawing_vc9.vcproj | 8 ++++---- samples/drawing/makefile.bcc | 5 ++++- samples/drawing/makefile.gcc | 5 ++++- samples/drawing/makefile.vc | 5 ++++- samples/drawing/makefile.wat | 6 +++++- samples/erase/Makefile.in | 4 +++- samples/erase/erase_vc7.vcproj | 8 ++++---- samples/erase/erase_vc8.vcproj | 8 ++++---- samples/erase/erase_vc9.vcproj | 8 ++++---- samples/erase/makefile.bcc | 5 ++++- samples/erase/makefile.gcc | 5 ++++- samples/erase/makefile.vc | 5 ++++- samples/erase/makefile.wat | 6 +++++- samples/event/Makefile.in | 4 +++- samples/event/event_vc7.vcproj | 8 ++++---- samples/event/event_vc8.vcproj | 8 ++++---- samples/event/event_vc9.vcproj | 8 ++++---- samples/event/makefile.bcc | 5 ++++- samples/event/makefile.gcc | 5 ++++- samples/event/makefile.vc | 5 ++++- samples/event/makefile.wat | 6 +++++- samples/except/Makefile.in | 4 +++- samples/except/except_vc7.vcproj | 8 ++++---- samples/except/except_vc8.vcproj | 8 ++++---- samples/except/except_vc9.vcproj | 8 ++++---- samples/except/makefile.bcc | 5 ++++- samples/except/makefile.gcc | 5 ++++- samples/except/makefile.vc | 5 ++++- samples/except/makefile.wat | 6 +++++- samples/exec/Makefile.in | 4 +++- samples/exec/exec_vc7.vcproj | 8 ++++---- samples/exec/exec_vc8.vcproj | 8 ++++---- samples/exec/exec_vc9.vcproj | 8 ++++---- samples/exec/makefile.bcc | 5 ++++- samples/exec/makefile.gcc | 5 ++++- samples/exec/makefile.vc | 5 ++++- samples/exec/makefile.wat | 6 +++++- samples/flash/flash_vc7.vcproj | 8 ++++---- samples/flash/flash_vc8.vcproj | 8 ++++---- samples/flash/flash_vc9.vcproj | 8 ++++---- samples/flash/makefile.vc | 5 ++++- samples/font/Makefile.in | 4 +++- samples/font/font_vc7.vcproj | 8 ++++---- samples/font/font_vc8.vcproj | 8 ++++---- samples/font/font_vc9.vcproj | 8 ++++---- samples/font/makefile.bcc | 5 ++++- samples/font/makefile.gcc | 5 ++++- samples/font/makefile.vc | 5 ++++- samples/font/makefile.wat | 6 +++++- samples/fswatcher/Makefile.in | 4 +++- samples/fswatcher/fswatcher_vc7.vcproj | 8 ++++---- samples/fswatcher/fswatcher_vc8.vcproj | 8 ++++---- samples/fswatcher/fswatcher_vc9.vcproj | 8 ++++---- samples/fswatcher/makefile.bcc | 5 ++++- samples/fswatcher/makefile.gcc | 5 ++++- samples/fswatcher/makefile.vc | 5 ++++- samples/fswatcher/makefile.wat | 6 +++++- samples/grid/Makefile.in | 4 +++- samples/grid/grid_vc7.vcproj | 8 ++++---- samples/grid/grid_vc8.vcproj | 8 ++++---- samples/grid/grid_vc9.vcproj | 8 ++++---- samples/grid/makefile.bcc | 5 ++++- samples/grid/makefile.gcc | 5 ++++- samples/grid/makefile.vc | 5 ++++- samples/grid/makefile.wat | 6 +++++- samples/help/Makefile.in | 4 +++- samples/help/help_vc7.vcproj | 8 ++++---- samples/help/help_vc8.vcproj | 8 ++++---- samples/help/help_vc9.vcproj | 8 ++++---- samples/help/makefile.bcc | 5 ++++- samples/help/makefile.gcc | 5 ++++- samples/help/makefile.vc | 5 ++++- samples/help/makefile.wat | 6 +++++- samples/htlbox/Makefile.in | 4 +++- samples/htlbox/htlbox_vc7.vcproj | 8 ++++---- samples/htlbox/htlbox_vc8.vcproj | 8 ++++---- samples/htlbox/htlbox_vc9.vcproj | 8 ++++---- samples/htlbox/makefile.bcc | 5 ++++- samples/htlbox/makefile.gcc | 5 ++++- samples/htlbox/makefile.vc | 5 ++++- samples/htlbox/makefile.wat | 6 +++++- samples/html/about/Makefile.in | 4 +++- samples/html/about/about_vc7.vcproj | 8 ++++---- samples/html/about/about_vc8.vcproj | 8 ++++---- samples/html/about/about_vc9.vcproj | 8 ++++---- samples/html/about/makefile.bcc | 5 ++++- samples/html/about/makefile.gcc | 5 ++++- samples/html/about/makefile.vc | 5 ++++- samples/html/about/makefile.wat | 6 +++++- samples/html/help/Makefile.in | 4 +++- samples/html/help/help_vc7.vcproj | 8 ++++---- samples/html/help/help_vc8.vcproj | 8 ++++---- samples/html/help/help_vc9.vcproj | 8 ++++---- samples/html/help/makefile.bcc | 5 ++++- samples/html/help/makefile.gcc | 5 ++++- samples/html/help/makefile.vc | 5 ++++- samples/html/help/makefile.wat | 6 +++++- samples/html/helpview/Makefile.in | 4 +++- samples/html/helpview/helpview_vc7.vcproj | 8 ++++---- samples/html/helpview/helpview_vc8.vcproj | 8 ++++---- samples/html/helpview/helpview_vc9.vcproj | 8 ++++---- samples/html/helpview/makefile.bcc | 5 ++++- samples/html/helpview/makefile.gcc | 5 ++++- samples/html/helpview/makefile.vc | 5 ++++- samples/html/helpview/makefile.wat | 6 +++++- samples/html/htmlctrl/Makefile.in | 4 +++- samples/html/printing/Makefile.in | 4 +++- samples/html/printing/makefile.bcc | 5 ++++- samples/html/printing/makefile.gcc | 5 ++++- samples/html/printing/makefile.vc | 5 ++++- samples/html/printing/makefile.wat | 6 +++++- samples/html/printing/printing_vc7.vcproj | 8 ++++---- samples/html/printing/printing_vc8.vcproj | 8 ++++---- samples/html/printing/printing_vc9.vcproj | 8 ++++---- samples/html/test/Makefile.in | 4 +++- samples/html/test/makefile.bcc | 5 ++++- samples/html/test/makefile.gcc | 5 ++++- samples/html/test/makefile.vc | 5 ++++- samples/html/test/makefile.wat | 6 +++++- samples/html/test/test_vc7.vcproj | 8 ++++---- samples/html/test/test_vc8.vcproj | 8 ++++---- samples/html/test/test_vc9.vcproj | 8 ++++---- samples/html/virtual/Makefile.in | 4 +++- samples/html/virtual/makefile.bcc | 5 ++++- samples/html/virtual/makefile.gcc | 5 ++++- samples/html/virtual/makefile.vc | 5 ++++- samples/html/virtual/makefile.wat | 6 +++++- samples/html/virtual/virtual_vc7.vcproj | 8 ++++---- samples/html/virtual/virtual_vc8.vcproj | 8 ++++---- samples/html/virtual/virtual_vc9.vcproj | 8 ++++---- samples/html/widget/Makefile.in | 4 +++- samples/html/widget/makefile.bcc | 5 ++++- samples/html/widget/makefile.gcc | 5 ++++- samples/html/widget/makefile.vc | 5 ++++- samples/html/widget/makefile.wat | 6 +++++- samples/html/widget/widget_vc7.vcproj | 8 ++++---- samples/html/widget/widget_vc8.vcproj | 8 ++++---- samples/html/widget/widget_vc9.vcproj | 8 ++++---- samples/html/zip/Makefile.in | 4 +++- samples/html/zip/makefile.bcc | 5 ++++- samples/html/zip/makefile.gcc | 5 ++++- samples/html/zip/makefile.vc | 5 ++++- samples/html/zip/makefile.wat | 6 +++++- samples/html/zip/zip_vc7.vcproj | 8 ++++---- samples/html/zip/zip_vc8.vcproj | 8 ++++---- samples/html/zip/zip_vc9.vcproj | 8 ++++---- samples/image/Makefile.in | 4 +++- samples/image/image_vc7.vcproj | 8 ++++---- samples/image/image_vc8.vcproj | 8 ++++---- samples/image/image_vc9.vcproj | 8 ++++---- samples/image/makefile.bcc | 5 ++++- samples/image/makefile.gcc | 5 ++++- samples/image/makefile.vc | 5 ++++- samples/image/makefile.wat | 6 +++++- samples/internat/Makefile.in | 4 +++- samples/internat/internat_vc7.vcproj | 8 ++++---- samples/internat/internat_vc8.vcproj | 8 ++++---- samples/internat/internat_vc9.vcproj | 8 ++++---- samples/internat/makefile.bcc | 5 ++++- samples/internat/makefile.gcc | 5 ++++- samples/internat/makefile.vc | 5 ++++- samples/internat/makefile.wat | 6 +++++- samples/ipc/Makefile.in | 6 ++++-- samples/ipc/ipc_vc7_ipcclient.vcproj | 8 ++++---- samples/ipc/ipc_vc7_ipcserver.vcproj | 8 ++++---- samples/ipc/ipc_vc8_ipcclient.vcproj | 8 ++++---- samples/ipc/ipc_vc8_ipcserver.vcproj | 8 ++++---- samples/ipc/ipc_vc9_ipcclient.vcproj | 8 ++++---- samples/ipc/ipc_vc9_ipcserver.vcproj | 8 ++++---- samples/ipc/makefile.bcc | 7 +++++-- samples/ipc/makefile.gcc | 7 +++++-- samples/ipc/makefile.vc | 7 +++++-- samples/ipc/makefile.wat | 8 ++++++-- samples/joytest/Makefile.in | 4 +++- samples/joytest/joytest_vc7.vcproj | 8 ++++---- samples/joytest/joytest_vc8.vcproj | 8 ++++---- samples/joytest/joytest_vc9.vcproj | 8 ++++---- samples/joytest/makefile.bcc | 5 ++++- samples/joytest/makefile.gcc | 5 ++++- samples/joytest/makefile.vc | 5 ++++- samples/joytest/makefile.wat | 6 +++++- samples/keyboard/Makefile.in | 4 +++- samples/keyboard/keyboard_vc7.vcproj | 8 ++++---- samples/keyboard/keyboard_vc8.vcproj | 8 ++++---- samples/keyboard/keyboard_vc9.vcproj | 8 ++++---- samples/keyboard/makefile.bcc | 5 ++++- samples/keyboard/makefile.gcc | 5 ++++- samples/keyboard/makefile.vc | 5 ++++- samples/keyboard/makefile.wat | 6 +++++- samples/layout/Makefile.in | 4 +++- samples/layout/layout_vc7.vcproj | 8 ++++---- samples/layout/layout_vc8.vcproj | 8 ++++---- samples/layout/layout_vc9.vcproj | 8 ++++---- samples/layout/makefile.bcc | 5 ++++- samples/layout/makefile.gcc | 5 ++++- samples/layout/makefile.vc | 5 ++++- samples/layout/makefile.wat | 6 +++++- samples/listctrl/Makefile.in | 4 +++- samples/listctrl/listctrl_vc7.vcproj | 8 ++++---- samples/listctrl/listctrl_vc8.vcproj | 8 ++++---- samples/listctrl/listctrl_vc9.vcproj | 8 ++++---- samples/listctrl/makefile.bcc | 5 ++++- samples/listctrl/makefile.gcc | 5 ++++- samples/listctrl/makefile.vc | 5 ++++- samples/listctrl/makefile.wat | 6 +++++- samples/mdi/Makefile.in | 4 +++- samples/mdi/makefile.bcc | 5 ++++- samples/mdi/makefile.gcc | 5 ++++- samples/mdi/makefile.vc | 5 ++++- samples/mdi/makefile.wat | 6 +++++- samples/mdi/mdi_vc7.vcproj | 8 ++++---- samples/mdi/mdi_vc8.vcproj | 8 ++++---- samples/mdi/mdi_vc9.vcproj | 8 ++++---- samples/mediaplayer/Makefile.in | 4 +++- samples/mediaplayer/makefile.bcc | 5 ++++- samples/mediaplayer/makefile.gcc | 5 ++++- samples/mediaplayer/makefile.vc | 5 ++++- samples/mediaplayer/makefile.wat | 6 +++++- samples/mediaplayer/mediaplayer_vc7.vcproj | 8 ++++---- samples/mediaplayer/mediaplayer_vc8.vcproj | 8 ++++---- samples/mediaplayer/mediaplayer_vc9.vcproj | 8 ++++---- samples/memcheck/Makefile.in | 4 +++- samples/memcheck/makefile.bcc | 5 ++++- samples/memcheck/makefile.gcc | 5 ++++- samples/memcheck/makefile.vc | 5 ++++- samples/memcheck/makefile.wat | 6 +++++- samples/memcheck/memcheck_vc7.vcproj | 8 ++++---- samples/memcheck/memcheck_vc8.vcproj | 8 ++++---- samples/memcheck/memcheck_vc9.vcproj | 8 ++++---- samples/menu/Makefile.in | 4 +++- samples/menu/makefile.bcc | 5 ++++- samples/menu/makefile.gcc | 5 ++++- samples/menu/makefile.vc | 5 ++++- samples/menu/makefile.wat | 6 +++++- samples/menu/menu_vc7.vcproj | 8 ++++---- samples/menu/menu_vc8.vcproj | 8 ++++---- samples/menu/menu_vc9.vcproj | 8 ++++---- samples/mfc/makefile.vc | 5 ++++- samples/mfc/mfc_vc7.vcproj | 8 ++++---- samples/mfc/mfc_vc8.vcproj | 8 ++++---- samples/mfc/mfc_vc9.vcproj | 8 ++++---- samples/minimal/Makefile.in | 4 +++- samples/minimal/makefile.bcc | 5 ++++- samples/minimal/makefile.gcc | 5 ++++- samples/minimal/makefile.vc | 5 ++++- samples/minimal/makefile.wat | 6 +++++- samples/minimal/minimal_vc7.vcproj | 8 ++++---- samples/minimal/minimal_vc8.vcproj | 8 ++++---- samples/minimal/minimal_vc9.vcproj | 8 ++++---- samples/nativdlg/Makefile.in | 4 +++- samples/nativdlg/makefile.bcc | 5 ++++- samples/nativdlg/makefile.gcc | 5 ++++- samples/nativdlg/makefile.vc | 5 ++++- samples/nativdlg/makefile.wat | 6 +++++- samples/nativdlg/nativdlg_vc7.vcproj | 8 ++++---- samples/nativdlg/nativdlg_vc8.vcproj | 8 ++++---- samples/nativdlg/nativdlg_vc9.vcproj | 8 ++++---- samples/notebook/Makefile.in | 4 +++- samples/notebook/makefile.bcc | 5 ++++- samples/notebook/makefile.gcc | 5 ++++- samples/notebook/makefile.vc | 5 ++++- samples/notebook/makefile.wat | 6 +++++- samples/notebook/notebook_vc7.vcproj | 8 ++++---- samples/notebook/notebook_vc8.vcproj | 8 ++++---- samples/notebook/notebook_vc9.vcproj | 8 ++++---- samples/oleauto/Makefile.in | 4 +++- samples/oleauto/makefile.bcc | 5 ++++- samples/oleauto/makefile.gcc | 5 ++++- samples/oleauto/makefile.vc | 5 ++++- samples/oleauto/makefile.wat | 6 +++++- samples/oleauto/oleauto_vc7.vcproj | 8 ++++---- samples/oleauto/oleauto_vc8.vcproj | 8 ++++---- samples/oleauto/oleauto_vc9.vcproj | 8 ++++---- samples/opengl/cube/Makefile.in | 4 +++- samples/opengl/cube/cube_vc7.vcproj | 8 ++++---- samples/opengl/cube/cube_vc8.vcproj | 8 ++++---- samples/opengl/cube/cube_vc9.vcproj | 8 ++++---- samples/opengl/cube/makefile.bcc | 5 ++++- samples/opengl/cube/makefile.gcc | 5 ++++- samples/opengl/cube/makefile.vc | 5 ++++- samples/opengl/cube/makefile.wat | 6 +++++- samples/opengl/isosurf/Makefile.in | 4 +++- samples/opengl/isosurf/isosurf_vc7.vcproj | 8 ++++---- samples/opengl/isosurf/isosurf_vc8.vcproj | 8 ++++---- samples/opengl/isosurf/isosurf_vc9.vcproj | 8 ++++---- samples/opengl/isosurf/makefile.bcc | 5 ++++- samples/opengl/isosurf/makefile.gcc | 5 ++++- samples/opengl/isosurf/makefile.vc | 5 ++++- samples/opengl/isosurf/makefile.wat | 6 +++++- samples/opengl/penguin/Makefile.in | 4 +++- samples/opengl/penguin/makefile.bcc | 5 ++++- samples/opengl/penguin/makefile.gcc | 5 ++++- samples/opengl/penguin/makefile.vc | 5 ++++- samples/opengl/penguin/makefile.wat | 6 +++++- samples/opengl/penguin/penguin_vc7.vcproj | 8 ++++---- samples/opengl/penguin/penguin_vc8.vcproj | 8 ++++---- samples/opengl/penguin/penguin_vc9.vcproj | 8 ++++---- samples/ownerdrw/Makefile.in | 4 +++- samples/ownerdrw/makefile.bcc | 5 ++++- samples/ownerdrw/makefile.gcc | 5 ++++- samples/ownerdrw/makefile.vc | 5 ++++- samples/ownerdrw/makefile.wat | 6 +++++- samples/ownerdrw/ownerdrw_vc7.vcproj | 8 ++++---- samples/ownerdrw/ownerdrw_vc8.vcproj | 8 ++++---- samples/ownerdrw/ownerdrw_vc9.vcproj | 8 ++++---- samples/popup/Makefile.in | 4 +++- samples/popup/makefile.bcc | 5 ++++- samples/popup/makefile.gcc | 5 ++++- samples/popup/makefile.vc | 5 ++++- samples/popup/makefile.wat | 6 +++++- samples/popup/popup_vc7.vcproj | 8 ++++---- samples/popup/popup_vc8.vcproj | 8 ++++---- samples/popup/popup_vc9.vcproj | 8 ++++---- samples/power/Makefile.in | 4 +++- samples/power/makefile.bcc | 5 ++++- samples/power/makefile.gcc | 5 ++++- samples/power/makefile.vc | 5 ++++- samples/power/makefile.wat | 6 +++++- samples/power/power_vc7.vcproj | 8 ++++---- samples/power/power_vc8.vcproj | 8 ++++---- samples/power/power_vc9.vcproj | 8 ++++---- samples/preferences/Makefile.in | 4 +++- samples/preferences/makefile.bcc | 5 ++++- samples/preferences/makefile.gcc | 5 ++++- samples/preferences/makefile.vc | 5 ++++- samples/preferences/makefile.wat | 6 +++++- samples/preferences/preferences_vc7.vcproj | 8 ++++---- samples/preferences/preferences_vc8.vcproj | 8 ++++---- samples/preferences/preferences_vc9.vcproj | 8 ++++---- samples/printing/Makefile.in | 4 +++- samples/printing/makefile.bcc | 5 ++++- samples/printing/makefile.gcc | 5 ++++- samples/printing/makefile.vc | 5 ++++- samples/printing/makefile.wat | 6 +++++- samples/printing/printing_vc7.vcproj | 8 ++++---- samples/printing/printing_vc8.vcproj | 8 ++++---- samples/printing/printing_vc9.vcproj | 8 ++++---- samples/propgrid/Makefile.in | 4 +++- samples/propgrid/makefile.bcc | 5 ++++- samples/propgrid/makefile.gcc | 5 ++++- samples/propgrid/makefile.vc | 5 ++++- samples/propgrid/makefile.wat | 6 +++++- samples/propgrid/propgrid_vc7.vcproj | 8 ++++---- samples/propgrid/propgrid_vc8.vcproj | 8 ++++---- samples/propgrid/propgrid_vc9.vcproj | 8 ++++---- samples/regtest/Makefile.in | 4 +++- samples/regtest/makefile.bcc | 5 ++++- samples/regtest/makefile.gcc | 5 ++++- samples/regtest/makefile.vc | 5 ++++- samples/regtest/makefile.wat | 6 +++++- samples/regtest/regtest_vc7.vcproj | 8 ++++---- samples/regtest/regtest_vc8.vcproj | 8 ++++---- samples/regtest/regtest_vc9.vcproj | 8 ++++---- samples/render/Makefile.in | 6 ++++-- samples/render/makefile.bcc | 7 +++++-- samples/render/makefile.gcc | 7 +++++-- samples/render/makefile.vc | 7 +++++-- samples/render/makefile.wat | 8 ++++++-- samples/render/render_vc7_renddll.vcproj | 4 ++-- samples/render/render_vc7_render.vcproj | 8 ++++---- samples/render/render_vc8_renddll.vcproj | 4 ++-- samples/render/render_vc8_render.vcproj | 8 ++++---- samples/render/render_vc9_renddll.vcproj | 4 ++-- samples/render/render_vc9_render.vcproj | 8 ++++---- samples/ribbon/Makefile.in | 4 +++- samples/ribbon/makefile.bcc | 5 ++++- samples/ribbon/makefile.gcc | 5 ++++- samples/ribbon/makefile.vc | 5 ++++- samples/ribbon/makefile.wat | 6 +++++- samples/ribbon/ribbon_vc7.vcproj | 8 ++++---- samples/ribbon/ribbon_vc8.vcproj | 8 ++++---- samples/ribbon/ribbon_vc9.vcproj | 8 ++++---- samples/richtext/Makefile.in | 4 +++- samples/richtext/makefile.bcc | 5 ++++- samples/richtext/makefile.gcc | 5 ++++- samples/richtext/makefile.vc | 5 ++++- samples/richtext/makefile.wat | 6 +++++- samples/richtext/richtext_vc7.vcproj | 8 ++++---- samples/richtext/richtext_vc8.vcproj | 8 ++++---- samples/richtext/richtext_vc9.vcproj | 8 ++++---- samples/sashtest/Makefile.in | 4 +++- samples/sashtest/makefile.bcc | 5 ++++- samples/sashtest/makefile.gcc | 5 ++++- samples/sashtest/makefile.vc | 5 ++++- samples/sashtest/makefile.wat | 6 +++++- samples/sashtest/sashtest_vc7.vcproj | 8 ++++---- samples/sashtest/sashtest_vc8.vcproj | 8 ++++---- samples/sashtest/sashtest_vc9.vcproj | 8 ++++---- samples/scroll/Makefile.in | 4 +++- samples/scroll/makefile.bcc | 5 ++++- samples/scroll/makefile.gcc | 5 ++++- samples/scroll/makefile.vc | 5 ++++- samples/scroll/makefile.wat | 6 +++++- samples/scroll/scroll_vc7.vcproj | 8 ++++---- samples/scroll/scroll_vc8.vcproj | 8 ++++---- samples/scroll/scroll_vc9.vcproj | 8 ++++---- samples/shaped/Makefile.in | 4 +++- samples/shaped/makefile.bcc | 5 ++++- samples/shaped/makefile.gcc | 5 ++++- samples/shaped/makefile.vc | 5 ++++- samples/shaped/makefile.wat | 6 +++++- samples/shaped/shaped_vc7.vcproj | 8 ++++---- samples/shaped/shaped_vc8.vcproj | 8 ++++---- samples/shaped/shaped_vc9.vcproj | 8 ++++---- samples/sockets/Makefile.in | 6 ++++-- samples/sockets/makefile.bcc | 7 +++++-- samples/sockets/makefile.gcc | 7 +++++-- samples/sockets/makefile.vc | 7 +++++-- samples/sockets/makefile.wat | 8 ++++++-- samples/sockets/sockets_vc7_client.vcproj | 8 ++++---- samples/sockets/sockets_vc7_server.vcproj | 8 ++++---- samples/sockets/sockets_vc8_client.vcproj | 8 ++++---- samples/sockets/sockets_vc8_server.vcproj | 8 ++++---- samples/sockets/sockets_vc9_client.vcproj | 8 ++++---- samples/sockets/sockets_vc9_server.vcproj | 8 ++++---- samples/sound/Makefile.in | 4 +++- samples/sound/makefile.bcc | 5 ++++- samples/sound/makefile.gcc | 5 ++++- samples/sound/makefile.vc | 5 ++++- samples/sound/makefile.wat | 6 +++++- samples/sound/sound_vc7.vcproj | 8 ++++---- samples/sound/sound_vc8.vcproj | 8 ++++---- samples/sound/sound_vc9.vcproj | 8 ++++---- samples/splash/Makefile.in | 4 +++- samples/splash/makefile.bcc | 5 ++++- samples/splash/makefile.gcc | 5 ++++- samples/splash/makefile.vc | 5 ++++- samples/splash/makefile.wat | 6 +++++- samples/splash/splash_vc7.vcproj | 8 ++++---- samples/splash/splash_vc8.vcproj | 8 ++++---- samples/splash/splash_vc9.vcproj | 8 ++++---- samples/splitter/Makefile.in | 4 +++- samples/splitter/makefile.bcc | 5 ++++- samples/splitter/makefile.gcc | 5 ++++- samples/splitter/makefile.vc | 5 ++++- samples/splitter/makefile.wat | 6 +++++- samples/splitter/splitter_vc7.vcproj | 8 ++++---- samples/splitter/splitter_vc8.vcproj | 8 ++++---- samples/splitter/splitter_vc9.vcproj | 8 ++++---- samples/statbar/Makefile.in | 4 +++- samples/statbar/makefile.bcc | 5 ++++- samples/statbar/makefile.gcc | 5 ++++- samples/statbar/makefile.vc | 5 ++++- samples/statbar/makefile.wat | 6 +++++- samples/statbar/statbar_vc7.vcproj | 8 ++++---- samples/statbar/statbar_vc8.vcproj | 8 ++++---- samples/statbar/statbar_vc9.vcproj | 8 ++++---- samples/stc/Makefile.in | 4 +++- samples/stc/makefile.bcc | 5 ++++- samples/stc/makefile.gcc | 5 ++++- samples/stc/makefile.vc | 5 ++++- samples/stc/makefile.wat | 6 +++++- samples/stc/stctest_vc7.vcproj | 8 ++++---- samples/stc/stctest_vc8.vcproj | 8 ++++---- samples/stc/stctest_vc9.vcproj | 8 ++++---- samples/svg/Makefile.in | 4 +++- samples/svg/makefile.bcc | 5 ++++- samples/svg/makefile.gcc | 5 ++++- samples/svg/makefile.vc | 5 ++++- samples/svg/makefile.wat | 6 +++++- samples/svg/svgtest_vc7.vcproj | 8 ++++---- samples/svg/svgtest_vc8.vcproj | 8 ++++---- samples/svg/svgtest_vc9.vcproj | 8 ++++---- samples/taborder/Makefile.in | 4 +++- samples/taborder/makefile.bcc | 5 ++++- samples/taborder/makefile.gcc | 5 ++++- samples/taborder/makefile.vc | 5 ++++- samples/taborder/makefile.wat | 6 +++++- samples/taborder/taborder_vc7.vcproj | 8 ++++---- samples/taborder/taborder_vc8.vcproj | 8 ++++---- samples/taborder/taborder_vc9.vcproj | 8 ++++---- samples/taskbar/Makefile.in | 4 +++- samples/taskbar/makefile.bcc | 5 ++++- samples/taskbar/makefile.gcc | 5 ++++- samples/taskbar/makefile.vc | 5 ++++- samples/taskbar/makefile.wat | 6 +++++- samples/taskbar/taskbar_vc7.vcproj | 8 ++++---- samples/taskbar/taskbar_vc8.vcproj | 8 ++++---- samples/taskbar/taskbar_vc9.vcproj | 8 ++++---- samples/text/Makefile.in | 4 +++- samples/text/makefile.bcc | 5 ++++- samples/text/makefile.gcc | 5 ++++- samples/text/makefile.vc | 5 ++++- samples/text/makefile.wat | 6 +++++- samples/text/text_vc7.vcproj | 8 ++++---- samples/text/text_vc8.vcproj | 8 ++++---- samples/text/text_vc9.vcproj | 8 ++++---- samples/thread/Makefile.in | 4 +++- samples/thread/makefile.bcc | 5 ++++- samples/thread/makefile.gcc | 5 ++++- samples/thread/makefile.vc | 5 ++++- samples/thread/makefile.wat | 6 +++++- samples/thread/thread_vc7.vcproj | 8 ++++---- samples/thread/thread_vc8.vcproj | 8 ++++---- samples/thread/thread_vc9.vcproj | 8 ++++---- samples/toolbar/Makefile.in | 4 +++- samples/toolbar/makefile.bcc | 5 ++++- samples/toolbar/makefile.gcc | 5 ++++- samples/toolbar/makefile.vc | 5 ++++- samples/toolbar/makefile.wat | 6 +++++- samples/toolbar/toolbar_vc7.vcproj | 8 ++++---- samples/toolbar/toolbar_vc8.vcproj | 8 ++++---- samples/toolbar/toolbar_vc9.vcproj | 8 ++++---- samples/treectrl/Makefile.in | 4 +++- samples/treectrl/makefile.bcc | 5 ++++- samples/treectrl/makefile.gcc | 5 ++++- samples/treectrl/makefile.vc | 5 ++++- samples/treectrl/makefile.wat | 6 +++++- samples/treectrl/treectrl_vc7.vcproj | 8 ++++---- samples/treectrl/treectrl_vc8.vcproj | 8 ++++---- samples/treectrl/treectrl_vc9.vcproj | 8 ++++---- samples/treelist/Makefile.in | 4 +++- samples/treelist/makefile.bcc | 5 ++++- samples/treelist/makefile.gcc | 5 ++++- samples/treelist/makefile.vc | 5 ++++- samples/treelist/makefile.wat | 6 +++++- samples/treelist/treelist_vc7.vcproj | 8 ++++---- samples/treelist/treelist_vc8.vcproj | 8 ++++---- samples/treelist/treelist_vc9.vcproj | 8 ++++---- samples/typetest/Makefile.in | 4 +++- samples/typetest/makefile.bcc | 5 ++++- samples/typetest/makefile.gcc | 5 ++++- samples/typetest/makefile.vc | 5 ++++- samples/typetest/makefile.wat | 6 +++++- samples/typetest/typetest_vc7.vcproj | 8 ++++---- samples/typetest/typetest_vc8.vcproj | 8 ++++---- samples/typetest/typetest_vc9.vcproj | 8 ++++---- samples/uiaction/Makefile.in | 4 +++- samples/uiaction/makefile.bcc | 5 ++++- samples/uiaction/makefile.gcc | 5 ++++- samples/uiaction/makefile.vc | 5 ++++- samples/uiaction/makefile.wat | 6 +++++- samples/uiaction/uiaction_vc7.vcproj | 8 ++++---- samples/uiaction/uiaction_vc8.vcproj | 8 ++++---- samples/uiaction/uiaction_vc9.vcproj | 8 ++++---- samples/validate/Makefile.in | 4 +++- samples/validate/makefile.bcc | 5 ++++- samples/validate/makefile.gcc | 5 ++++- samples/validate/makefile.vc | 5 ++++- samples/validate/makefile.wat | 6 +++++- samples/validate/validate_vc7.vcproj | 8 ++++---- samples/validate/validate_vc8.vcproj | 8 ++++---- samples/validate/validate_vc9.vcproj | 8 ++++---- samples/vscroll/Makefile.in | 4 +++- samples/vscroll/makefile.bcc | 5 ++++- samples/vscroll/makefile.gcc | 5 ++++- samples/vscroll/makefile.vc | 5 ++++- samples/vscroll/makefile.wat | 6 +++++- samples/vscroll/vscroll_vc7.vcproj | 8 ++++---- samples/vscroll/vscroll_vc8.vcproj | 8 ++++---- samples/vscroll/vscroll_vc9.vcproj | 8 ++++---- samples/webview/Makefile.in | 4 +++- samples/webview/makefile.bcc | 5 ++++- samples/webview/makefile.gcc | 5 ++++- samples/webview/makefile.vc | 5 ++++- samples/webview/makefile.wat | 6 +++++- samples/webview/webview_vc7.vcproj | 8 ++++---- samples/webview/webview_vc8.vcproj | 8 ++++---- samples/webview/webview_vc9.vcproj | 8 ++++---- samples/widgets/Makefile.in | 4 +++- samples/widgets/makefile.bcc | 5 ++++- samples/widgets/makefile.gcc | 5 ++++- samples/widgets/makefile.vc | 5 ++++- samples/widgets/makefile.wat | 6 +++++- samples/widgets/widgets_vc7.vcproj | 8 ++++---- samples/widgets/widgets_vc8.vcproj | 8 ++++---- samples/widgets/widgets_vc9.vcproj | 8 ++++---- samples/wizard/Makefile.in | 4 +++- samples/wizard/makefile.bcc | 5 ++++- samples/wizard/makefile.gcc | 5 ++++- samples/wizard/makefile.vc | 5 ++++- samples/wizard/makefile.wat | 6 +++++- samples/wizard/wizard_vc7.vcproj | 8 ++++---- samples/wizard/wizard_vc8.vcproj | 8 ++++---- samples/wizard/wizard_vc9.vcproj | 8 ++++---- samples/wrapsizer/Makefile.in | 4 +++- samples/wrapsizer/makefile.bcc | 5 ++++- samples/wrapsizer/makefile.gcc | 5 ++++- samples/wrapsizer/makefile.vc | 5 ++++- samples/wrapsizer/makefile.wat | 6 +++++- samples/wrapsizer/wrapsizer_vc7.vcproj | 8 ++++---- samples/wrapsizer/wrapsizer_vc8.vcproj | 8 ++++---- samples/wrapsizer/wrapsizer_vc9.vcproj | 8 ++++---- samples/xrc/Makefile.in | 4 +++- samples/xrc/makefile.bcc | 5 ++++- samples/xrc/makefile.gcc | 5 ++++- samples/xrc/makefile.vc | 5 ++++- samples/xrc/makefile.wat | 6 +++++- samples/xrc/xrcdemo_vc7.vcproj | 8 ++++---- samples/xrc/xrcdemo_vc8.vcproj | 8 ++++---- samples/xrc/xrcdemo_vc9.vcproj | 8 ++++---- samples/xti/Makefile.in | 4 +++- samples/xti/makefile.bcc | 5 ++++- samples/xti/makefile.gcc | 5 ++++- samples/xti/makefile.vc | 5 ++++- samples/xti/makefile.wat | 6 +++++- samples/xti/xti_vc7.vcproj | 8 ++++---- samples/xti/xti_vc8.vcproj | 8 ++++---- samples/xti/xti_vc9.vcproj | 8 ++++---- tests/Makefile.in | 4 +++- tests/benchmarks/Makefile.in | 4 +++- tests/benchmarks/bench_vc7_bench_gui.vcproj | 8 ++++---- tests/benchmarks/bench_vc8_bench_gui.vcproj | 8 ++++---- tests/benchmarks/bench_vc9_bench_gui.vcproj | 8 ++++---- tests/benchmarks/makefile.bcc | 5 ++++- tests/benchmarks/makefile.gcc | 5 ++++- tests/benchmarks/makefile.vc | 5 ++++- tests/benchmarks/makefile.wat | 6 +++++- tests/makefile.bcc | 5 ++++- tests/makefile.gcc | 5 ++++- tests/makefile.vc | 5 ++++- tests/makefile.wat | 6 +++++- tests/test_vc7_test_gui.vcproj | 8 ++++---- tests/test_vc8_test_gui.vcproj | 8 ++++---- tests/test_vc9_test_gui.vcproj | 8 ++++---- utils/emulator/src/Makefile.in | 4 +++- utils/emulator/src/emulator_vc7.vcproj | 8 ++++---- utils/emulator/src/emulator_vc8.vcproj | 8 ++++---- utils/emulator/src/emulator_vc9.vcproj | 8 ++++---- utils/emulator/src/makefile.bcc | 5 ++++- utils/emulator/src/makefile.gcc | 5 ++++- utils/emulator/src/makefile.vc | 5 ++++- utils/emulator/src/makefile.wat | 6 +++++- utils/helpview/src/Makefile.in | 4 +++- utils/helpview/src/helpview_vc7.vcproj | 8 ++++---- utils/helpview/src/helpview_vc8.vcproj | 8 ++++---- utils/helpview/src/helpview_vc9.vcproj | 8 ++++---- utils/helpview/src/makefile.bcc | 5 ++++- utils/helpview/src/makefile.gcc | 5 ++++- utils/helpview/src/makefile.vc | 5 ++++- utils/helpview/src/makefile.wat | 6 +++++- utils/hhp2cached/Makefile.in | 4 +++- utils/hhp2cached/hhp2cached_vc7.vcproj | 8 ++++---- utils/hhp2cached/hhp2cached_vc8.vcproj | 8 ++++---- utils/hhp2cached/hhp2cached_vc9.vcproj | 8 ++++---- utils/hhp2cached/makefile.bcc | 5 ++++- utils/hhp2cached/makefile.gcc | 5 ++++- utils/hhp2cached/makefile.vc | 5 ++++- utils/hhp2cached/makefile.wat | 6 +++++- utils/screenshotgen/src/Makefile.in | 4 +++- utils/screenshotgen/src/makefile.bcc | 5 ++++- utils/screenshotgen/src/makefile.gcc | 5 ++++- utils/screenshotgen/src/makefile.vc | 5 ++++- utils/screenshotgen/src/makefile.wat | 6 +++++- utils/screenshotgen/src/screenshotgen_vc7.vcproj | 8 ++++---- utils/screenshotgen/src/screenshotgen_vc8.vcproj | 8 ++++---- utils/screenshotgen/src/screenshotgen_vc9.vcproj | 8 ++++---- 854 files changed, 3424 insertions(+), 1851 deletions(-) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index c8b45a7847..242693e8d8 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -635,6 +635,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(LIB_PNG) + + $(LIB_SCINTILLA) + + diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index d6469fbb32..df65b0da36 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -114,6 +114,8 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) +@COND_MONOLITHIC_1@__LIB_SCINTILLA_IF_MONO_p = \ +@COND_MONOLITHIC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -151,7 +153,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) - $(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(__bombs___mac_setfilecmd) $(__bombs___os2_emxbindcmd) diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj index 4e467db1fb..1628a42804 100644 --- a/demos/bombs/bombs_vc7.vcproj +++ b/demos/bombs/bombs_vc7.vcproj @@ -46,7 +46,7 @@