multilib linking fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/access/access.bkl

@@ -6,6 +6,7 @@
     <exe id="accesstest" template="wx_sample" template_append="wx_append">
         <sources>accesstest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>accesstest.rc</win32-res>
     </exe>
 

samples/artprov/artprov.bkl

@@ -6,6 +6,7 @@
     <exe id="arttest" template="wx_sample" template_append="wx_append">
         <sources>arttest.cpp artbrows.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>arttest.rc</win32-res>
     </exe>
 

samples/calendar/calendar.bkl

@@ -6,6 +6,7 @@
     <exe id="calendar" template="wx_sample" template_append="wx_append">
         <sources>calendar.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>calendar.rc</win32-res>
     </exe>
 

samples/caret/caret.bkl

@@ -6,6 +6,7 @@
     <exe id="caret" template="wx_sample" template_append="wx_append">
         <sources>caret.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>caret.rc</win32-res>
     </exe>
 

samples/checklst/checklst.bkl

@@ -6,6 +6,7 @@
     <exe id="checklst" template="wx_sample" template_append="wx_append">
         <sources>checklst.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>checklst.rc</win32-res>
     </exe>
 

samples/config/config.bkl

@@ -6,6 +6,7 @@
     <exe id="conftest" template="wx_sample" template_append="wx_append">
         <sources>conftest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>conftest.rc</win32-res>
     </exe>
 

samples/controls/controls.bkl

@@ -6,6 +6,7 @@
     <exe id="controls" template="wx_sample" template_append="wx_append">
         <sources>controls.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>controls.rc</win32-res>
     </exe>
 

samples/db/db.bkl

@@ -6,6 +6,7 @@
     <exe id="dbtest" template="wx_sample" template_append="wx_append">
         <sources>dbtest.cpp listdb.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>dbtest.rc</win32-res>
     </exe>
 

samples/dialogs/dialogs.bkl

@@ -6,6 +6,7 @@
     <exe id="dialogs" template="wx_sample" template_append="wx_append">
         <sources>dialogs.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>dialogs.rc</win32-res>
     </exe>
 

samples/dialup/dialup.bkl

@@ -6,6 +6,7 @@
     <exe id="nettest" template="wx_sample" template_append="wx_append">
         <sources>nettest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>nettest.rc</win32-res>
     </exe>
 

samples/display/display.bkl

@@ -6,6 +6,7 @@
     <exe id="display" template="wx_sample" template_append="wx_append">
         <sources>display.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
     </exe>
 
 </makefile>

samples/dnd/dnd.bkl

@@ -6,6 +6,7 @@
     <exe id="dnd" template="wx_sample" template_append="wx_append">
         <sources>dnd.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>dnd.rc</win32-res>
     </exe>
 

samples/docview/docview.bkl

@@ -6,6 +6,7 @@
     <exe id="docview" template="wx_sample" template_append="wx_append">
         <sources>docview.cpp doc.cpp view.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>docview.rc</win32-res>
         <mac-res>chart.r doc.r docview.r mondrian.r</mac-res>
     </exe>

samples/docvwmdi/docvwmdi.bkl

@@ -6,6 +6,7 @@
     <exe id="docview" template="wx_sample" template_append="wx_append">
         <sources>docview.cpp doc.cpp view.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>docview.rc</win32-res>
     </exe>
 

samples/dragimag/dragimag.bkl

@@ -6,6 +6,7 @@
     <exe id="dragimag" template="wx_sample" template_append="wx_append">
         <sources>dragimag.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>dragimag.rc</win32-res>
     </exe>
 

samples/drawing/drawing.bkl

@@ -6,6 +6,7 @@
     <exe id="drawing" template="wx_sample" template_append="wx_append">
         <sources>drawing.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>drawing.rc</win32-res>
     </exe>
 

samples/dynamic/dynamic.bkl

@@ -6,6 +6,7 @@
     <exe id="dynamic" template="wx_sample" template_append="wx_append">
         <sources>dynamic.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>dynamic.rc</win32-res>
     </exe>
 

samples/erase/erase.bkl

@@ -6,6 +6,7 @@
     <exe id="erase" template="wx_sample" template_append="wx_append">
         <sources>erase.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>erase.rc</win32-res>
     </exe>
 

samples/event/event.bkl

@@ -6,6 +6,7 @@
     <exe id="event" template="wx_sample" template_append="wx_append">
         <sources>event.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>event.rc</win32-res>
     </exe>
 

samples/exec/exec.bkl

@@ -6,6 +6,7 @@
     <exe id="exec" template="wx_sample" template_append="wx_append">
         <sources>exec.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>exec.rc</win32-res>
     </exe>
 

samples/font/font.bkl

@@ -6,6 +6,7 @@
     <exe id="font" template="wx_sample" template_append="wx_append">
         <sources>font.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>font.rc</win32-res>
     </exe>
 

samples/grid/grid.bkl

@@ -6,6 +6,7 @@
     <exe id="grid" template="wx_sample" template_append="wx_append">
         <sources>griddemo.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>grid.rc</win32-res>
     </exe>
 

samples/help/help.bkl

@@ -6,6 +6,7 @@
     <exe id="help" template="wx_sample" template_append="wx_append">
         <sources>demo.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>help.rc</win32-res>
     </exe>
 

samples/htlbox/htlbox.bkl

@@ -6,6 +6,7 @@
     <exe id="htlbox" template="wx_sample" template_append="wx_append">
         <sources>htlbox.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>htlbox.rc</win32-res>
     </exe>
 

samples/image/image.bkl

@@ -8,6 +8,7 @@
     <exe id="image" template="wx_sample" template_append="wx_append">
         <sources>image.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>image.rc</win32-res>
     </exe>
 

samples/internat/internat.bkl

@@ -6,6 +6,7 @@
     <exe id="internat" template="wx_sample" template_append="wx_append">
         <sources>internat.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>internat.rc</win32-res>
     </exe>
 

samples/ipc/ipc.bkl

@@ -6,6 +6,7 @@
     <exe id="ipc" template="wx_sample" template_append="wx_append">
         <sources>ipc.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>ipc.rc</win32-res>
     </exe>
 

samples/joytest/joytest.bkl

@@ -6,6 +6,7 @@
     <exe id="joytest" template="wx_sample" template_append="wx_append">
         <sources>joytest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>joytest.rc</win32-res>
     </exe>
 

samples/keyboard/keyboard.bkl

@@ -6,6 +6,7 @@
     <exe id="keyboard" template="wx_sample" template_append="wx_append">
         <sources>keyboard.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>keyboard.rc</win32-res>
     </exe>
 

samples/layout/layout.bkl

@@ -6,6 +6,7 @@
     <exe id="layout" template="wx_sample" template_append="wx_append">
         <sources>layout.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>layout.rc</win32-res>
     </exe>
 

samples/listbox/listbox.bkl

@@ -6,6 +6,7 @@
     <exe id="listbox" template="wx_sample" template_append="wx_append">
         <sources>listbox.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>listbox.rc</win32-res>
     </exe>
 

samples/listctrl/listctrl.bkl

@@ -6,6 +6,7 @@
     <exe id="listctrl" template="wx_sample" template_append="wx_append">
         <sources>listctrl.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>listctrl.rc</win32-res>
     </exe>
 

samples/mdi/mdi.bkl

@@ -6,6 +6,7 @@
     <exe id="mdi" template="wx_sample" template_append="wx_append">
         <sources>mdi.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>mdi.rc</win32-res>
     </exe>
 

samples/memcheck/memcheck.bkl

@@ -6,6 +6,7 @@
     <exe id="memcheck" template="wx_sample" template_append="wx_append">
         <sources>memcheck.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>memcheck.rc</win32-res>
     </exe>
 

samples/menu/menu.bkl

@@ -6,6 +6,7 @@
     <exe id="menu" template="wx_sample" template_append="wx_append">
         <sources>menu.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>menu.rc</win32-res>
     </exe>
 

samples/mfc/mfc.bkl

@@ -6,6 +6,7 @@
     <exe id="mfc" template="wx_sample" template_append="wx_append">
         <sources>mfc.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>mfc.rc</win32-res>
     </exe>
 

samples/minifram/minifram.bkl

@@ -6,6 +6,7 @@
     <exe id="minifram" template="wx_sample" template_append="wx_append">
         <sources>minifram.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>minifram.rc</win32-res>
     </exe>
 

samples/mobile/mobile.bkl

@@ -6,6 +6,7 @@
     <exe id="mobile" template="wx_sample" template_append="wx_append">
         <sources>mobile.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>mobile.rc</win32-res>
     </exe>
 

samples/multimon/multimon.bkl

@@ -6,6 +6,7 @@
     <exe id="multimon" template="wx_sample" template_append="wx_append">
         <sources>multimon.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>multimon.rc</win32-res>
     </exe>
 

samples/nativdlg/nativdlg.bkl

@@ -6,6 +6,7 @@
     <exe id="nativdlg" template="wx_sample" template_append="wx_append">
         <sources>nativdlg.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>nativdlg.rc</win32-res>
     </exe>
 

samples/newgrid/newgrid.bkl

@@ -6,6 +6,7 @@
     <exe id="newgrid" template="wx_sample" template_append="wx_append">
         <sources>newgrid.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>newgrid.rc</win32-res>
     </exe>
 

samples/notebook/notebook.bkl

@@ -6,6 +6,7 @@
     <exe id="notebook" template="wx_sample" template_append="wx_append">
         <sources>notebook.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>notebook.rc</win32-res>
     </exe>
 

samples/oleauto/oleauto.bkl

@@ -6,6 +6,7 @@
     <exe id="oleauto" template="wx_sample" template_append="wx_append">
         <sources>oleauto.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>oleauto.rc</win32-res>
     </exe>
 

samples/opengl/opengl.bkl

@@ -6,6 +6,7 @@
     <exe id="opengl" template="wx_sample" template_append="wx_append">
         <sources>opengl.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>opengl.rc</win32-res>
     </exe>
 

samples/ownerdrw/ownerdrw.bkl

@@ -6,6 +6,7 @@
     <exe id="ownerdrw" template="wx_sample" template_append="wx_append">
         <sources>ownerdrw.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>ownerdrw.rc</win32-res>
     </exe>
 

samples/png/png.bkl

@@ -6,6 +6,7 @@
     <exe id="png" template="wx_sample" template_append="wx_append">
         <sources>png.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>png.rc</win32-res>
     </exe>
 

samples/printing/printing.bkl

@@ -6,6 +6,7 @@
     <exe id="printing" template="wx_sample" template_append="wx_append">
         <sources>printing.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>printing.rc</win32-res>
     </exe>
 

samples/propsize/propsize.bkl

@@ -6,6 +6,7 @@
     <exe id="propsize" template="wx_sample" template_append="wx_append">
         <sources>propsize.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>propsize.rc</win32-res>
     </exe>
 

samples/regtest/regtest.bkl

@@ -6,6 +6,7 @@
     <exe id="regtest" template="wx_sample" template_append="wx_append">
         <sources>regtest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>regtest.rc</win32-res>
     </exe>
 

samples/richedit/richedit.bkl

@@ -6,6 +6,7 @@
     <exe id="richedit" template="wx_sample" template_append="wx_append">
         <sources>richedit.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>richedit.rc</win32-res>
     </exe>
 

samples/rotate/rotate.bkl

@@ -6,6 +6,7 @@
     <exe id="rotate" template="wx_sample" template_append="wx_append">
         <sources>rotate.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>rotate.rc</win32-res>
     </exe>
 

samples/sashtest/sashtest.bkl

@@ -6,6 +6,7 @@
     <exe id="sashtest" template="wx_sample" template_append="wx_append">
         <sources>sashtest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>sashtest.rc</win32-res>
     </exe>
 

samples/scroll/scroll.bkl

@@ -6,6 +6,7 @@
     <exe id="scroll" template="wx_sample" template_append="wx_append">
         <sources>scroll.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>scroll.rc</win32-res>
     </exe>
 

samples/scrollsub/scrollsub.bkl

@@ -6,6 +6,7 @@
     <exe id="scrollsub" template="wx_sample" template_append="wx_append">
         <sources>scrollsub.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>scrollsub.rc</win32-res>
     </exe>
 

samples/shaped/shaped.bkl

@@ -6,6 +6,7 @@
     <exe id="shaped" template="wx_sample" template_append="wx_append">
         <sources>shaped.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>shaped.rc</win32-res>
     </exe>
 

samples/sockets/sockets.bkl

@@ -6,6 +6,7 @@
     <exe id="sockets" template="wx_sample" template_append="wx_append">
         <sources>sockets.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>sockets.rc</win32-res>
     </exe>
 

samples/splitter/splitter.bkl

@@ -6,6 +6,7 @@
     <exe id="splitter" template="wx_sample" template_append="wx_append">
         <sources>splitter.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>splitter.rc</win32-res>
     </exe>
 

samples/statbar/statbar.bkl

@@ -6,6 +6,7 @@
     <exe id="statbar" template="wx_sample" template_append="wx_append">
         <sources>statbar.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>statbar.rc</win32-res>
     </exe>
 

samples/tab/tab.bkl

@@ -6,6 +6,7 @@
     <exe id="tab" template="wx_sample" template_append="wx_append">
         <sources>tab.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>tab.rc</win32-res>
     </exe>
 

samples/taskbar/taskbar.bkl

@@ -6,6 +6,7 @@
     <exe id="taskbar" template="wx_sample" template_append="wx_append">
         <sources>taskbar.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>taskbar.rc</win32-res>
     </exe>
 

samples/text/text.bkl

@@ -6,6 +6,7 @@
     <exe id="text" template="wx_sample" template_append="wx_append">
         <sources>text.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>text.rc</win32-res>
     </exe>
 

samples/thread/thread.bkl

@@ -6,6 +6,7 @@
     <exe id="thread" template="wx_sample" template_append="wx_append">
         <sources>thread.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>thread.rc</win32-res>
     </exe>
 

samples/toolbar/toolbar.bkl

@@ -6,6 +6,7 @@
     <exe id="toolbar" template="wx_sample" template_append="wx_append">
         <sources>toolbar.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>toolbar.rc</win32-res>
     </exe>
 

samples/treectrl/treectrl.bkl

@@ -6,6 +6,7 @@
     <exe id="treectrl" template="wx_sample" template_append="wx_append">
         <sources>treectrl.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>treectrl.rc</win32-res>
     </exe>
 

samples/typetest/typetest.bkl

@@ -6,6 +6,7 @@
     <exe id="typetest" template="wx_sample" template_append="wx_append">
         <sources>typetest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>typetest.rc</win32-res>
     </exe>
 

samples/validate/validate.bkl

@@ -6,6 +6,7 @@
     <exe id="validate" template="wx_sample" template_append="wx_append">
         <sources>validate.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>validate.rc</win32-res>
     </exe>
 

samples/vscroll/vscroll.bkl

@@ -6,6 +6,7 @@
     <exe id="vscroll" template="wx_sample" template_append="wx_append">
         <sources>vscroll.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>vscroll.rc</win32-res>
     </exe>
 

samples/widgets/widgets.bkl

@@ -8,6 +8,7 @@
                  radiobox.cpp slider.cpp spinbtn.cpp static.cpp textctrl.cpp
                  widgets.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>widgets.rc</win32-res>
     </exe>
 

samples/wizard/wizard.bkl

@@ -6,6 +6,7 @@
     <exe id="wizard" template="wx_sample" template_append="wx_append">
         <sources>wizard.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>wizard.rc</win32-res>
     </exe>
 

samples/wxtest/wxtest.bkl

@@ -6,6 +6,7 @@
     <exe id="wxtest" template="wx_sample" template_append="wx_append">
         <sources>wxtest.cpp</sources>
         <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
         <win32-res>wxtest.rc</win32-res>
     </exe>