X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..01168e9591c6114140768de014695e3908922033:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 1265f4fc8e..70f7f8317f 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -25,6 +25,9 @@
     <set var="WX_VERSION" make_var="1">
         $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)
     </set>
+    <set var="WX_RELEASE" make_var="1">
+        $(WXVER_MAJOR).$(WXVER_MINOR)
+    </set>
 
     <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
 
@@ -74,7 +77,7 @@
         <if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
     </set>
     <set var="WXNAMESUFFIX">
-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)
+        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
     </set>
     
     <set var="WXUNIVNAME">
@@ -137,6 +140,9 @@
     <set var="WXLIB_XML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
     </set>
+    <set var="WXLIB_XRC">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
+    </set>
     <set var="WXLIB_ODBC">
         <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
             $(mk.evalExpr(wxwin.mkLibName('odbc')))
@@ -257,7 +263,7 @@
     </template>
 
     <template id="3rdparty_lib" template="common_settings,anylib">
-        <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+        <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
         <!--
         we want to install 3rd party libs system-wide only with static
         version of wxWidgets; otherwise they are embedded in shared libs:
@@ -416,7 +422,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <libname>$(WXLIBNAME)</libname>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf'">
+            <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
                 <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/msw/dummy.cpp
@@ -428,8 +434,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <precomp-headers-exclude>
                 src/common/unzip.c
                 src/common/extended.c
-                src/msw/gsocket.c
-                src/msw/gsockmsw.c
+                src/msw/gsocket.cpp
+                src/msw/gsockmsw.cpp
             </precomp-headers-exclude>
         </if>
         
@@ -524,9 +530,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
     
     <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>
+        <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">