From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 5 Jul 2003 14:19:41 +0000 (+0000)
Subject: samples must use same settings as the libraries
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5e3746dc75dafab097cd76cf8ff5f5b09f4c5c9f

samples must use same settings as the libraries


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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 5205742c95..6ed713a200 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -156,24 +156,24 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
+
+    <template id="anything">
+        <debug-info>$(DEBUGFLAG)</debug-info>
+        <optimize>$(OPTIMIZEFLAG)</optimize>
+        <threading>multi</threading>
+        <runtime-libs>dynamic</runtime-libs>
+        <if cond="FORMAT!='autoconf'">
+            <cppflags>$(EXTRACFLAGS)</cppflags>
+        </if>
+    </template>
     
     <template id="anylib">
         <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
-        
-        <debug-info>$(DEBUGFLAG)</debug-info>
-        <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>
-        <runtime-libs>dynamic</runtime-libs>
-
         <if cond="FORMAT!='autoconf'">
-            <define>WINVER=0x0400</define>
-            <define>_WIN32_IE=0x0400</define>
-            <define>STRICT</define>
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
-
     </template>
 
     <template id="3rdparty_lib" template="anylib">
@@ -198,7 +198,7 @@
     <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
 
-    <template id="wx">
+    <template id="wx" template="anything">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>