Remove Unicode option support from wx-config and wxwin.m4
Keep the option itself, but hardcode its value.
This commit is contained in:
parent
c78b0d652b
commit
31ac8012e4
5 changed files with 30 additions and 65 deletions
6
configure
vendored
6
configure
vendored
|
|
@ -650,7 +650,6 @@ WXCONFIG_CFLAGS
|
|||
WX_CFLAGS
|
||||
WXCONFIG_CPPFLAGS
|
||||
WX_CPPFLAGS
|
||||
WX_CHARTYPE
|
||||
WX_SUBVERSION
|
||||
WX_VERSION
|
||||
WX_RELEASE
|
||||
|
|
@ -32283,8 +32282,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
WX_CHARTYPE="unicode"
|
||||
|
||||
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
|
||||
WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
|
||||
|
||||
|
|
@ -32297,7 +32294,7 @@ WX_VERSION_TAG=`echo WXU${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
|
|||
|
||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}u${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||
|
||||
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
||||
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-unicode${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
||||
|
||||
|
||||
if test "$wxUSE_OSX_COCOA" = 1; then
|
||||
|
|
@ -43775,7 +43772,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue