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

Set MONOLITHIC for posix platforms based on the output of wx-config,

Browse Source 
use this to add the media lib if needed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-06-06 17:49:06 +00:00
parent f4da9a9431
commit 401569f1a1
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
wxPython/config.py
View File

@@ -284,41 +284,6 @@ for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
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
INSTALL_MULTIVERSION=%d
FLAVOUR="%s"
EP_ADD_OPTS=%d
EP_FULL_VER=%d
WX_CONFIG="%s"
WXPORT="%s"
MONOLITHIC=%d
FINAL=%d
HYBRID=%d
""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
try:
from build_options import *
except:
build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
if not os.path.exists(build_options_file):
try:
myfile = open(build_options_file, "w")
myfile.write(build_options_template)
myfile.close()
except:
print "WARNING: Unable to create build_options.py."
#----------------------------------------------------------------------
# some helper functions
#----------------------------------------------------------------------
@@ -793,6 +758,7 @@ elif os.name == 'posix':
cflags.append('-O3')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
MONOLITHIC = (lflags.find("_xrc") == -1)
lflags = lflags.split()
WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1]
@@ -847,6 +813,41 @@ else:
raise 'Sorry, platform not supported...'
#----------------------------------------------------------------------
# build options file
#----------------------------------------------------------------------
if SYS_WX_CONFIG is None:
SYS_WX_CONFIG = WX_CONFIG
build_options_template = """
UNICODE=%d
UNDEF_NDEBUG=%d
INSTALL_MULTIVERSION=%d
FLAVOUR="%s"
EP_ADD_OPTS=%d
EP_FULL_VER=%d
WX_CONFIG="%s"
WXPORT="%s"
MONOLITHIC=%d
FINAL=%d
HYBRID=%d
""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
try:
from build_options import *
except:
build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
if not os.path.exists(build_options_file):
try:
myfile = open(build_options_file, "w")
myfile.write(build_options_template)
myfile.close()
except:
print "WARNING: Unable to create build_options.py."
#----------------------------------------------------------------------
# post platform setup checks and tweaks, create the full version string
#----------------------------------------------------------------------