fixed bug in previous commit: WXTOPDIR not set

[wxWidgets.git] / build / bakefiles / common_samples.bkl

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index 4352f8bcc1b1d7d9a9e7b131630567501d174a6a..d12dd210b432d4c83e43d333cc2ccb2b49fa459b 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -11,7 +11,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
-                Carbon.r ../../lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
             </if>
         </set>
     </if>
@@ -20,16 +20,22 @@
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     
-    <template id="wx_sample" template="wx">
+    <template id="wx_sample_b" template="wx">
         <include>$(SRCDIR)</include>
         <!-- Always link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
         <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <define>$(DLLFLAG)</define>
+    </template>
+    
+    <template id="wx_sample" template="wx_sample_b">
         <app-type>gui</app-type>
-
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     </template>
+    
+    <template id="wx_sample_console" template="wx_sample_b">
+        <app-type>console</app-type>
+    </template>
 
     
     <!-- =============================================================== -->