Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

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

diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index 2685c8095a0c091bc9e3458d1f192ef8fc89133c..b04b88e4f0623fb9f18b6c1afb228867fb705088 100644 (file)
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -3,29 +3,36 @@
 
     <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/filedlgg.cpp
-            ../../src/generic/fontdlgg.cpp
+    <set var="GENERIC_DIALOGS_IN_NATIVE_BUILDS">
+        <if cond="OUT_OF_TREE_MAKEFILES=='1'">
+            <!-- no files that are not part of the sample in this case -->
         </if>
-        <if cond="TOOLKIT=='MAC' and WXUNIV=='0'">
-            ../../src/generic/colrdlgg.cpp
-            ../../src/generic/dirdlgg.cpp
-            ../../src/generic/filedlgg.cpp
+        <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 cond="TOOLKIT=='PM' and WXUNIV=='0'">
-            ../../src/generic/fontdlgg.cpp
-            ../../src/generic/filedlgg.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 cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+            $(WXTOPDIR)src/generic/filedlgg.cpp
+        </if>
+        <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
-            $(GENERIC_FILES)
+            $(GENERIC_DIALOGS_IN_NATIVE_BUILDS)
         </sources>
+        <headers>dialogs.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>