X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88a264a08a023e9544b684fd2dc28e8dd7b1c7d..1a2df6a75b3d96b35e29b1cf392758cbeeef93e0:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 89080fa27e..d4f343018d 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -61,16 +61,20 @@
         <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
     </set>
 
+    <!-- debug suffix used for Windows libraries which use debug CRT -->
     <set var="WXDEBUGFLAG">
-        <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
-        <if cond="DEBUG_FLAG=='1'">d</if>
+        <if cond="BUILD=='debug' and DEBUG_RUNTIME_LIBS=='default'">d</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='1'">d</if>
     </set>
     <set var="WXUNICODEFLAG">
         <!-- WinCE is Unicode-only platform: -->
         <if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
     </set>
+    <set var="WX_U_D_SUFFIX">
+        $(WXUNICODEFLAG)$(WXDEBUGFLAG)
+    </set>
     <set var="WXNAMESUFFIX">
-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+        $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR)
     </set>
 
     <set var="WXUNIVNAME">
@@ -145,6 +149,9 @@
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>
+    <set var="WXLIB_PROPGRID">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if>
+    </set>
     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>
@@ -174,7 +181,7 @@
             <if cond="SHARED=='1'">dll</if>
         </set>
         <set var="CFG_NAME_PART">
-            $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+            $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
         </set>
 
         <!-- NB: this is make_var so that it can be overriden on command line
@@ -204,7 +211,7 @@
 
     <if cond="FORMAT!='autoconf'">
         <set var="SETUPHDIR" make_var="1">
-            $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+            $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)
         </set>
     </if>
 
@@ -254,8 +261,7 @@
     </set>
 
     <set var="DEBUG_DEFINE">
-        <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
-        <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
+        <if cond="DEBUG_FLAG=='0'">wxDEBUG_LEVEL=0</if>
     </set>
     <!-- does not cover all cases, but better than nothing -->
     <set var="NO_VC_CRTDBG">
@@ -321,7 +327,7 @@
 
     <template id="3rdparty_lib" template="common_settings,anylib">
         <if cond="FORMAT=='autoconf'">
-            <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
+            <libname>$(id)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
         </if>
         <if cond="FORMAT!='autoconf'">
             <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
@@ -354,20 +360,6 @@ InputPath=..\..\include\wx\%s
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
     </set>
-    <!-- this should be removed after new bakefile release -->
-    <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
-        <if cond="BAKEFILE_VERSION!='0.2.3'">
-            <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
-        </if>
-        <set var="msvc_copy_setup_h_script">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
-
-"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-        </set>
-    </if>
-    <!-- end of what should be removed after new bakefile release -->
 
     <define-tag name="msvc-headers-setup-h" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
@@ -426,19 +418,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
-            <!-- this should be removed after new bakefile release -->
-            <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
-                <if cond="BAKEFILE_VERSION!='0.2.3'">
-                    <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
-                </if>
-                <set var="_custom_build_include_wx_msw_genrcdefs_h">
-Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
-                </set>
-            </if>
         </if>
     </define-tag>
 
@@ -570,6 +549,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
+                <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't
+                     know if it is here so just add it unconditionally -->
+                <sys-lib>wininet</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
@@ -658,8 +640,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT=='autoconf'">
             <res-include>$(RCDEFDIR)</res-include>
             <res-include>$(TOP_SRCDIR)include</res-include>
+            <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
+        
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
@@ -731,13 +715,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </set>
     <set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
 
-    <set var="PLUGINSUFFIX">
-        <if cond="UNICODE=='0' and BUILD=='release'"></if>
-        <if cond="UNICODE=='0' and BUILD=='debug'">d</if>
-        <if cond="UNICODE=='1' and BUILD=='release'">u</if>
-        <if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
-    </set>
-
     <set var="PLUGINS_INST_DIR" make_var="1">
         $(LIBDIR)/wx/$(PLUGIN_VERSION0)
     </set>
@@ -745,7 +722,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <define-rule name="wx-base-plugin" extends="module">
         <template>
             <dllname>
-                $(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
             </dllname>
             <define>WXUSINGDLL</define>
             <define>wxUSE_GUI=0</define>
@@ -756,7 +733,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <define-rule name="wx-gui-plugin" extends="module">
         <template template="wx">
             <dllname>
-                $(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
+                $(id)_$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
             </dllname>
             <define>WXUSINGDLL</define>
             <install-to>$(PLUGINS_INST_DIR)</install-to>