From 416f5bc835673bc46b008430d2b0122043e157ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 8 Aug 2003 11:49:35 +0000
Subject: [PATCH] (re)added MSLU support to Unicode builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/Makefile         |  2 +-
 build/bakefiles/common.bkl       |  5 +++++
 build/bakefiles/config.bkl       | 13 +++++++++++++
 build/bakefiles/regenMakefile.py |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index caad1fda88..7062626633 100644
--- 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 \
-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f769c3f40f..55baf22277 100644
--- 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="UNICOWS_LIB">
+        <if cond="MSLU=='1'">unicows</if>
+    </set>
 
     <template id="common_settings">
         <debug-info>$(DEBUGINFO)</debug-info>
@@ -267,6 +271,7 @@
 
         <!-- 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>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index bba9e60848..28e94c95d1 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -32,6 +32,19 @@
         </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>
diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index bbae5cdc0c..71aeda9e2f 100755
--- 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 \\
-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
-- 
2.50.0