From: Robin Dunn Date: Thu, 2 Feb 2006 02:02:27 +0000 (+0000) Subject: use UNICODE=1 by default X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1efe352383ef85974614186a1fbb3cdbb55368e6 use UNICODE=1 by default git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/b b/wxPython/b index ffa2477fb1..19f3569512 100755 --- a/wxPython/b +++ b/wxPython/b @@ -36,18 +36,28 @@ SETUP="python$PYVER -u setup.py" FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" OTHERFLAGS="" PORTFLAGS="" +UNIFLAG="UNICODE=1" if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then - PORTFLAGS="WXPORT=gtk UNICODE=0" + PORTFLAGS="WXPORT=gtk" + UNIFLAG="UNICODE=0" shift elif [ "$1" = "gtk2" ]; then - PORTFLAGS="WXPORT=gtk2 UNICODE=1" + PORTFLAGS="WXPORT=gtk2" + UNIFLAG="UNICODE=1" shift fi -FLAGS="$FLAGS $PORTFLAGS" +for p in $*; do + if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then + UNIFLAG="" + break + fi +done + +FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"