use common resource and icon files for samples

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

build/bakefiles/common_samples.bkl

@@ -13,7 +13,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
-                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(WXTOPDIR)samples/sample.r
             </if>
         </set>
     </if>
@@ -30,6 +30,7 @@
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
+        <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
     </template>
     
     <template id="wx_util_console" template="wx_util_b">

build/bakefiles/config.bkl

@@ -160,6 +160,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
+        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
     </if>
 
     

build/bakefiles/regenMakefile.py

@@ -124,7 +124,7 @@ def onSubmakefile(type, dirname, names):
         cfgbase = '../../../build/config.'
 
     args = {
-        'not_autoconf':dirflags,
+        'all':dirflags,
         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
         'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
         'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',