compilation fix for gcc4 (patch 1428840)

[wxWidgets.git] / samples / dialogs / dialogs.bkl

diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index 042f10561cb1067e7cfb098182dc67f6396f380b..684193e7dfcaaf044c1a0e2c530cbeeed5d67ec4 100644 (file)
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -3,27 +3,32 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 

-    <set var="GENERIC_FILES">
-        <if cond="TOOLKIT=='MSW' and WXUNIV=='0'">
-            ../../src/generic/colrdlgg.cpp
-            ../../src/generic/dirdlgg.cpp
-            ../../src/generic/fontdlgg.cpp
+    <set var="GENERIC_DIALOGS_IN_NATIVE_BUILDS">
+        <if cond="TOOLKIT=='MSW' and WXUNIV=='0' and SHARED=='0'">
+            $(WXTOPDIR)src/generic/colrdlgg.cpp
+            $(WXTOPDIR)src/generic/dirdlgg.cpp
+            $(WXTOPDIR)src/generic/filedlgg.cpp
+            $(WXTOPDIR)src/generic/fontdlgg.cpp

         </if>
         </if>

-        <if cond="TOOLKIT=='MAC' and WXUNIV=='0'">
-            ../../src/generic/colrdlgg.cpp
-            ../../src/generic/dirdlgg.cpp
+        <if cond="TOOLKIT=='MAC' and WXUNIV=='0' and SHARED=='0'">
+            $(WXTOPDIR)src/generic/colrdlgg.cpp
+            $(WXTOPDIR)src/generic/dirdlgg.cpp
+            $(WXTOPDIR)src/generic/filedlgg.cpp

         </if>
         </if>

-        <if cond="TOOLKIT=='PM' and WXUNIV=='0'">
-            ../../src/generic/fontdlgg.cpp
+        <if cond="TOOLKIT=='PM' and WXUNIV=='0' and SHARED=='0'">
+            $(WXTOPDIR)src/generic/fontdlgg.cpp
+            $(WXTOPDIR)src/generic/filedlgg.cpp

         </if>
     </set>
 
     <exe id="dialogs" template="wx_sample" template_append="wx_append">
         <sources>
             dialogs.cpp
         </if>
     </set>
 
     <exe id="dialogs" template="wx_sample" template_append="wx_append">
         <sources>
             dialogs.cpp

-            $(GENERIC_FILES)
+            $(GENERIC_DIALOGS_IN_NATIVE_BUILDS)

         </sources>
         <wx-lib>adv</wx-lib>
         </sources>
         <wx-lib>adv</wx-lib>

+        <wx-lib>html</wx-lib>
+        <wx-lib>xml</wx-lib>

         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>dialogs.rc</win32-res>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>dialogs.rc</win32-res>