solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove UNICODE build option, hardcode its value as 1

Browse source 
Also hardcode "u" suffix for the library names -- it doesn't make sense
any longer, but we need to keep it for compatibility.
This commit is contained in:
Vadim Zeitlin 2022-10-27 19:36:43 +02:00
parent 6e8290a9ce
commit c78b0d652b
371 changed files with 3371 additions and 4770 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/bakefiles/build_cfg.bkl
View file

@ -24,7 +24,7 @@
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
@echo UNICODE=1 >>$(BUILD_CFG_FILE)
@echo TOOLKIT=$(TOOLKIT) >>$(BUILD_CFG_FILE)
@echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE)
@echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)

5
build/bakefiles/common.bkl
View file

@ -90,11 +90,8 @@
<if cond="BUILD=='debug' and DEBUG_RUNTIME_LIBS=='default'">d</if>
<if cond="DEBUG_RUNTIME_LIBS=='1'">d</if>
</set>
<set var="WXUNICODEFLAG">
<if cond="UNICODE=='1'">u</if>
</set>
<set var="WX_U_D_SUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)
u$(WXDEBUGFLAG)
</set>
<set var="WXNAMESUFFIX">
$(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR)

18
build/bakefiles/config.bkl
View file

@ -92,23 +92,6 @@
</option>
</if>
<!-- don't include ANSI configuration in project files, it's going to be
eventually removed anyway and it only doubles the number of build
configs in projects: -->
<if cond="IS_MSVC_PRJ=='1'">
<set var="UNICODE">1</set>
</if>
<if cond="IS_MSVC_PRJ=='0'">
<option name="UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
<default-value>1</default-value>
<description>
Compile Unicode build of wxWidgets?
</description>
</option>
</if>
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
@ -565,7 +548,6 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
<set var="BUILD">debug</set>
<set var="SHARED">0</set>
<set var="WXUNIV">0</set>
<set var="UNICODE">1</set>
<!-- Free version does not distribute OpenGL,
in commercial distribution better use dmars_smake format -->
<set var="USE_OPENGL">0</set>

8
build/bakefiles/regex.bkl
View file

@ -7,7 +7,7 @@
<option name="wxPCRE2_CODE_UNIT_WIDTH"/>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
wxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
<set var="INC_REGEX_BUILD">
@ -18,7 +18,7 @@
<set var="wxUSE_REGEX">builtin</set>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">
wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
wxregexu$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
@ -32,10 +32,10 @@
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<libname cond="FORMAT=='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
$(id)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</libname>
<libname cond="FORMAT!='autoconf'">
$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
$(id)u$(WXDEBUGFLAG)$(HOST_SUFFIX)
</libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>

5
build/bakefiles/wxpresets/bakefile_quickstart.txt
View file

@ -167,8 +167,8 @@ subfolder of Bakefile, or you can also find it on the Bakefile web site.
-- Build Options --
What if you want to offer a DEBUG and a RELEASE build? Or a UNICODE/ANSI
build? You can do this in Bakefile by creating options. To create an option,
What if you want to offer a DEBUG and a RELEASE build?
You can do this in Bakefile by creating options. To create an option,
use the "<option>" tag. A typical option has three important parts: a name, a
default value, and a comma-separated list of values. For example, here is how
to create a DEBUG option which builds debug by default:
@ -235,7 +235,6 @@ options are:
WX_MONOLITHIC 0(default),1 Set this to 1 if you built wx
as a monolithic library
WX_SHARED 0(default),1 Specify static or dynamic wx libs
WX_UNICODE 0(default),1 Use ANSI or UNICODE wx libs
WX_DEBUG 0,1(default) Use release or debug wx libs
*WX_VERSION 25,26(default) Specify version of wx libs

3
build/bakefiles/wxpresets/libsample/configure.in
View file

@ -32,9 +32,8 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_CXXCPP
dnl we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
dnl we want to always have DEBUG==WX_DEBUG
WX_DEBUG=$DEBUG
WX_UNICODE=$UNICODE
dnl the following macros will search for the best matching wxWidgets build
dnl (taking in count the values of the --enable-debug|unicode|shared and of