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

Merged modifications from the 2.6 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wxPython/config.py
View File

@@ -147,6 +147,15 @@ WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# version, port, etc. and it will be looked for on the
# default $PATH.
SYS_WX_CONFIG = None # When installing an in tree build, setup.py uses wx-config
# for two different purposes. First, to determine the prefix
# where files will be installed, and secondly, to initialise
# build_options.py with the correct options for it.
# WX_CONFIG is used for the first task. SYS_WX_CONFIG may
# be set independently, to the value that should appear in
# build_options.py, if it is different to that. The default
# is to use the value of WX_CONFIG.
WXPORT = 'gtk2' # On Linux/Unix there are several ports of wxWidgets available.
# Setting this value lets you select which will be used for
# the wxPython build. Possibilites are 'gtk', 'gtk2' and
@@ -255,8 +264,8 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
sys.argv[x] = ''
# String options
for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
]:
for x in range(len(sys.argv)):
if sys.argv[x].find(option) == 0:
@@ -272,6 +281,9 @@ sys.argv = filter(None, sys.argv)
# build options file
#----------------------------------------------------------------------
if SYS_WX_CONFIG is None:
SYS_WX_CONFIG = WX_CONFIG
build_options_template = """
UNICODE=%d
UNDEF_NDEBUG=%d
@@ -284,7 +296,7 @@ MONOLITHIC=%d
FINAL=%d
HYBRID=%d
""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
try:
from build_options import *