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

Updated /debian with the latest changes from 2.2 branch.

Browse Source 
Applied patch from 2.2 to setup.py to allow the setting
of a 'trick' wx-config for in-tree package builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-03-18 23:11:58 +00:00
parent 01a5f47468
commit afa3e1edcd
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/setup.py
View File

@@ -42,6 +42,10 @@ IN_CVS_TREE = 0 # Set to true if building in a full wxWindows CVS
# tree, otherwise will assume all needed files are
# available in the wxPython source distribution
WX_CONFIG = "wx-config" # Usually you shouldn't need to touch this,
# but you can set it to pass an alternate
# version of wx-config or alternate flags,
# eg. as required by the .deb in-tree build.
# Some MSW build settings
@@ -75,8 +79,7 @@ debug = '--debug' in sys.argv or '-g' in sys.argv
#----------------------------------------------------------------------
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID',
'WXDLLVER', ]:
'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], flag) == 0:
pos = string.find(sys.argv[x], '=') + 1
@@ -84,6 +87,14 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
vars()[flag] = eval(sys.argv[x][pos:])
sys.argv[x] = ''
for option in ['WX_CONFIG', 'WXDLLVER', ]:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], option) == 0:
pos = string.find(sys.argv[x], '=') + 1
if pos > 0:
vars()[option] = sys.argv[x][pos:]
sys.argv[x] = ''
sys.argv = filter(None, sys.argv)
@@ -172,11 +183,11 @@ elif os.name == 'posix':
libdirs = []
libs = []
cflags = os.popen('wx-config --cflags', 'r').read()[:-1] + ' ' + \
cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
os.popen('gtk-config --cflags', 'r').read()[:-1]
cflags = string.split(cflags)
lflags = os.popen('wx-config --libs', 'r').read()[:-1]
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = string.split(lflags)