Warning fixes after char->wxChar in wxVariant.

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index b08b68a0bd27ee0a7f625b5952fb0f7ccf57eada..47d330fb4471334ecb2e0a8c24512c5a5d6b5a62 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,7 +39,7 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 7
 VER_RELEASE      = 0
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 7
 VER_RELEASE      = 0

-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets

 VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"


@@ -574,7 +574,7 @@ def adjustCFLAGS(cflags, defines, includes):
 
 
 
 
 
 

-def adjustLFLAGS(lfags, libdirs, libs):
+def adjustLFLAGS(lflags, libdirs, libs):

     '''Extract the -L and -l flags and put them in libdirs and libs as needed'''
     newLFLAGS = []
     for flag in lflags:
     '''Extract the -L and -l flags and put them in libdirs and libs as needed'''
     newLFLAGS = []
     for flag in lflags:


@@ -585,7 +585,11 @@ def adjustLFLAGS(lfags, libdirs, libs):
         else:
             newLFLAGS.append(flag)
 
         else:
             newLFLAGS.append(flag)
 

-    return newLFLAGS
+    # remove any flags for universal binaries, we'll get those from
+    # distutils instead
+    return [flag for flag in newLFLAGS
+            if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and
+            not flag.startswith('/Developer') ]

 
 
 
 
 
 


@@ -698,7 +702,6 @@ if os.name == 'nt':
                  makeLibName('core')[0],
                  makeLibName('adv')[0],
                  makeLibName('html')[0],
                  makeLibName('core')[0],
                  makeLibName('adv')[0],
                  makeLibName('html')[0],

-                 makeLibName('xrc')[0],

                  ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
                  ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',