max warnings for wxWindows code, default for 3rd party

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 6747e1edc81f6e9b4ad044cf6ebadf6ad87918c1..fad21295c4cb3e894792aa9124f64bce5d9d95ca 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -204,7 +204,7 @@
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
     <set var="UNICODE_DEFINE">

-        <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
+        <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>

     </set>
     
     <set var="UNICOWS_LIB">
     </set>
     
     <set var="UNICOWS_LIB">


@@ -264,6 +264,7 @@
         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>

+        <warnings>max</warnings>

     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->


@@ -321,11 +322,11 @@
                 include\wx\msw\setup.h
             </set>
             <set var="__custom_build_include_wx_msw_setup_h">
                 include\wx\msw\setup.h
             </set>
             <set var="__custom_build_include_wx_msw_setup_h">

-Creating $(LIBDIRNAME)\wx\setup.h
+Creating $(SETUPHDIR)\wx\setup.h

 InputPath=..\include\wx\msw\setup.h
 
 InputPath=..\include\wx\msw\setup.h
 

-"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
+"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h

             </set>
         </if>
     </define-tag>
             </set>
         </if>
     </define-tag>


@@ -413,18 +414,24 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>

+
+    <template id="msvc_setup_h">
+        <msvc-copy-setup-h/>
+    </template>

     
     

-    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_includes"/>
-    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_includes">
+    <template id="wx_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
+    <template id="wx_base_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">

         <define>wxUSE_GUI=0</define> 
     </template>
 
     <template id="wx_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
         <define>wxUSE_GUI=0</define> 
     </template>
 
     <template id="wx_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"

-              template_append="wx_append_nomono"/>
+              template_append="msvc_setup_h,wx_append_nomono"/>

     <template id="wx_base_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
     <template id="wx_base_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"

-              template_append="wx_append_base_nomono">
+              template_append="msvc_setup_h,wx_append_base_nomono">

         <define>wxUSE_GUI=0</define> 
     </template>
                            
         <define>wxUSE_GUI=0</define> 
     </template>