Minor build tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -240,11 +240,7 @@ if FINAL:
|
||||
HYBRID = 0
|
||||
|
||||
if UNICODE and WXPORT not in ['msw', 'gtk2']:
|
||||
raise SystemExit, "UNICODE mode not surrently supported on this WXPORT."
|
||||
|
||||
if UNICODE:
|
||||
BUILD_BASE = BUILD_BASE + '.unicode'
|
||||
VERSION = VERSION + 'u'
|
||||
raise SystemExit, "UNICODE mode not surrently supported on this WXPORT: "+WXPORT
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
@@ -389,9 +385,12 @@ elif os.name == 'posix':
|
||||
WXPLAT = '__WXGTK__'
|
||||
GENDIR = 'gtk' # no code differences so use the same generated sources
|
||||
portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
|
||||
BUILD_BASE = BUILD_BASE + '-' + WXPORT
|
||||
print "got here..."
|
||||
elif WXPORT == 'x11':
|
||||
WXPLAT = '__WXX11__'
|
||||
portcfg = ''
|
||||
BUILD_BASE = BUILD_BASE + '-' + WXPORT
|
||||
else:
|
||||
raise SystemExit, "Unknown WXPORT value: " + WXPORT
|
||||
|
||||
@@ -429,6 +428,15 @@ else:
|
||||
raise 'Sorry Charlie...'
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# post platform setup checks and tweaks
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if UNICODE:
|
||||
BUILD_BASE = BUILD_BASE + '.unicode'
|
||||
VERSION = VERSION + 'u'
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Check if the version file needs updated
|
||||
#----------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user