wx-config is configurable...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6cedba093a
commit
266839eee9
@ -277,9 +277,9 @@ class BuildConfig:
|
||||
self.HELPERLIB = 'wxPyHelpers'
|
||||
self.HELPERLIBDIR = '/usr/local/lib'
|
||||
self.CFLAGS = '-DSWIG_GLOBAL -DHAVE_CONFIG_H $(THREAD) -I. '\
|
||||
'`wx-config --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
|
||||
'`$(WXCONFIG) --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
|
||||
'-I$(WXPSRCDIR)'
|
||||
self.LFLAGS = '-L$(WXPSRCDIR) `wx-config --libs`'
|
||||
self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`'
|
||||
self.LIBS = '-l$(HELPERLIB)'
|
||||
self.RMCMD = '-rm -f '
|
||||
|
||||
@ -322,12 +322,12 @@ class BuildConfig:
|
||||
# so we can do some sanity checking...
|
||||
if sys.platform != 'win32':
|
||||
if not self.CCC:
|
||||
self.CCC = os.popen('wx-config --cxx', 'r').read()[:-1]
|
||||
self.CCC = os.popen('$(WXCONFIG) --cxx', 'r').read()[:-1]
|
||||
if not self.CCC:
|
||||
print "Warning: C++ compiler not specified (CCC). Assuming c++"
|
||||
self.CCC = 'c++'
|
||||
if not self.CC:
|
||||
self.CCC = os.popen('wx-config --cc', 'r').read()[:-1]
|
||||
self.CCC = os.popen('$(WXCONFIG) --cc', 'r').read()[:-1]
|
||||
if not self.CC:
|
||||
print "Warning: C compiler not specified (CC). Assuming cc"
|
||||
self.CC = 'cc'
|
||||
@ -678,7 +678,7 @@ GENCODEDIR = %(GENCODEDIR)s
|
||||
WXPSRCDIR = %(WXPSRCDIR)s
|
||||
HELPERLIB = %(HELPERLIB)s
|
||||
HELPERLIBDIR = %(HELPERLIBDIR)s
|
||||
|
||||
WXCONFIG=wx-config
|
||||
TARGETDIR = %(TARGETDIR)s
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user