(re)added MSLU support to Unicode builds

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

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index caad1fda88c16c9f11a517bfd8c5e4331e4bcfed..70626266337ac3c7e45e6eae0956ce55521f8166 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -10,7 +10,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \

-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0

 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f769c3f40f5d4fefcb48094c4f24e8a113a3abae..55baf222772c2637e6b7a15d3b41d922e7772b11 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -194,6 +194,10 @@
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>

+    
+    <set var="UNICOWS_LIB">
+        <if cond="MSLU=='1'">unicows</if>
+    </set>

 
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>
 
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>


@@ -267,6 +271,7 @@
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">

+            <sys-lib>$(UNICOWS_LIB)</sys-lib>

             <if cond="COMPILER=='bcc'">
                 <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>
             <if cond="COMPILER=='bcc'">
                 <sys-lib>import32</sys-lib>
                 <sys-lib>ole2w32</sys-lib>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index bba9e608483d4229fec632693f216a358e0c0c14..28e94c95d199fbfaa87a381223af1300f241f223 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -32,6 +32,19 @@
         </description>
     </option>
 
         </description>
     </option>
 

+    <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
+        <option name="MSLU">
+            <values>0,1</values>
+            <default-value>0</default-value>        
+            <description>
+                Use MSLU library when building Unicode version.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
+        <set var="MSLU">0</set>
+    </if>
+

     <option name="BUILD">
         <values>debug,release</values>
         <values-description>Debug,Release</values-description>
     <option name="BUILD">
         <values>debug,release</values>
         <values-description>Debug,Release</values-description>

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index bbae5cdc0c39c52927ea51911970068b1a10b0ff..71aeda9e2f9e2e9937f0cd5a2733eb185f1ee997 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -32,7 +32,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\

-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0

 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp