Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(re)added MSLU support to Unicode builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-08 11:49:35 +00:00
parent 17dcec6308
commit 416f5bc835
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/Makefile
View File

@@ -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 \ DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
-DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=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

5
build/bakefiles/common.bkl
View File

@@ -194,6 +194,10 @@
<set var="UNICODE_DEFINE"> <set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if> <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
</set> </set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<template id="common_settings"> <template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info> <debug-info>$(DEBUGINFO)</debug-info>
@@ -267,6 +271,7 @@
<!-- system libraries on windows: --> <!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="COMPILER=='bcc'"> <if cond="COMPILER=='bcc'">
<sys-lib>import32</sys-lib> <sys-lib>import32</sys-lib>
<sys-lib>ole2w32</sys-lib> <sys-lib>ole2w32</sys-lib>

13
build/bakefiles/config.bkl
View File

@@ -32,6 +32,19 @@
</description> </description>
</option> </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"> <option name="BUILD">
<values>debug,release</values> <values>debug,release</values>
<values-description>Debug,Release</values-description> <values-description>Debug,Release</values-description>

2
build/bakefiles/regenMakefile.py
View File

@@ -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 \\ DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
-DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=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