X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/305b8c10f1edef28c6e6073886b26885ed4e195d..6098c7f9533ba4fe22b04048e92c7ac0b9c0ebe7:/utils/wxPython/distrib/build.py

diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py
index 3ff35d745d..7d8a913511 100755
--- a/utils/wxPython/distrib/build.py
+++ b/utils/wxPython/distrib/build.py
@@ -119,7 +119,7 @@ import sys, os, string, getopt
 # This is really the wxPython version number, and will be placed in the
 # Makefiles for use with the distribution related targets.
 
-__version__ = '2.1.5'
+__version__ = '2.1.14'
 
 #----------------------------------------------------------------------------
 
@@ -189,7 +189,7 @@ def main(args):
             print "Running:", cmd
             err = os.system(cmd)
 
-    return err
+    return err/256
 
 
 #----------------------------------------------------------------------------
@@ -277,11 +277,13 @@ 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 '
+            self.WXCONFIG = 'wx-config'
+
 
             # **** What to do when I start supporting Motif, etc.???
             self.GENCODEDIR = 'gtk'
@@ -322,11 +324,15 @@ class BuildConfig:
         # so we can do some sanity checking...
         if sys.platform != 'win32':
 	    if not self.CCC:
-		print "Warning: C++ compiler not specified (CCC). Assuming c++"
-		self.CCC = 'c++'
-	    if not self.CC:
-		print "Warning: C compiler not specified (CC). Assuming cc"
-		self.CC = 'cc'
+                self.CCC = os.popen('%(WXCONFIG)s --cxx' % self.__dict__, '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('%(WXCONFIG)s --cc' % self.__dict__, 'r').read()[:-1]
+                if not self.CC:
+                    print "Warning: C compiler not specified (CC). Assuming cc"
+                    self.CC = 'cc'
 
     #------------------------------------------------------------
     def findMFValue(self, mfText, st):
@@ -457,7 +463,7 @@ class BuildConfig:
             for st in args:
                 pair = string.split(st, '=')
                 name = pair[0]
-                value = pair[1]
+                value = string.join(pair[1:], '=')
                 self.__dict__[name] = value
         except:
             print "Error parsing command-line: %s" % st
@@ -600,7 +606,7 @@ $(CPPFLAGS) /c $<
 $(TARGET) : $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(RESFILE)
 	$(link) @<<
 /out:$@
-$(LFLAGS) /def:$(MODULE).def /implib:./$(MODULE).lib
+$(LFLAGS) /export:init$(MODULE) /implib:./$(MODULE).lib
 $(DUMMYOBJ) $(OBJECTS) $(RESFILE)
 $(LIBS)
 <<
@@ -674,7 +680,7 @@ GENCODEDIR = %(GENCODEDIR)s
 WXPSRCDIR = %(WXPSRCDIR)s
 HELPERLIB = %(HELPERLIB)s
 HELPERLIBDIR = %(HELPERLIBDIR)s
-
+WXCONFIG=%(WXCONFIG)s
 TARGETDIR = %(TARGETDIR)s