adapted Julian's new speed improved version

[wxWidgets.git] / build / bakefiles / wxpresets / presets / wx_win32.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index dfb564ca84e784f7002d2ee8a6b1e11b48542fb5..541e9fecf8a6f417ede5f4d06be69a896a6cd34f 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -82,10 +82,7 @@
 
     <!--    All the possible mixes for the wx library names          -->
     <set var="WXLIB_BASE_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
+        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
 
         <!--
             the trick used to support monolithic builds is here: when the
@@ -93,27 +90,15 @@
             WX_MONOLITHIC=1, then the base library is translated to the
             monolithic library
         -->
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
+        <if cond="WX_MONOLITHIC=='1'">wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
     </set>
 
 
     <!--   Libraries whose name is prefixed with 'wxbase'            -->
     <define-global-tag name="define-wxbase-lib-name">
         <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
-                wxbase$(WX_VERSION)_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
-                wxbase$(WX_VERSION)d_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
-                wxbase$(WX_VERSION)u_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
-                wxbase$(WX_VERSION)ud_$(value)
+            <if cond="WX_MONOLITHIC=='0'">
+                wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
             </if>
     </set>
     </define-global-tag>
@@ -125,17 +110,8 @@
     <!--   Libraries whose name is prefixed with 'wx' only          -->
     <define-global-tag name="define-wxlib-name">
         <set var="WXLIB_$(value.upper())_NAME">
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
-                wx$(WX_PORT)$(WX_VERSION)_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
-                wx$(WX_PORT)$(WX_VERSION)d_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
-                wx$(WX_PORT)$(WX_VERSION)u_$(value)
-            </if>
-            <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
-                wx$(WX_PORT)$(WX_VERSION)ud_$(value)
+            <if cond="WX_MONOLITHIC=='0'">
+                wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
             </if>
         </set>
     </define-global-tag>
@@ -146,12 +122,11 @@
     <define-wxlib-name>html</define-wxlib-name>
     <define-wxlib-name>adv</define-wxlib-name>
     <define-wxlib-name>qa</define-wxlib-name>
-    <define-wxlib-name>gl</define-wxlib-name>
     <define-wxlib-name>aui</define-wxlib-name>
     <define-wxlib-name>stc</define-wxlib-name>
     <define-wxlib-name>richtext</define-wxlib-name>
 
-
+    <!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
 
 
 
@@ -185,11 +160,15 @@
         <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
         <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
         <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
-        <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
         <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
 
+        <!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
+        <if cond="value=='gl'">
+            <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+        </if>
+
         <if cond="value=='stc'">
             <!-- wxSTC requires also the basic scintilla library
                  which is built as a separate 3rd party library -->