X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf636c45552003b64827c228c1c0d3f930344623..66202a7ee6d36fcca5b8d7159eca7ceb743f2f77:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 31cbb64d1a..685c914828 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -16,8 +16,8 @@ from distutils.command.install_data import install_data
 VER_MAJOR        = 2      # The first three must match wxWindows
 VER_MINOR        = 5
 VER_RELEASE      = 1
-VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS        = "p8"   # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWindows
+VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -107,6 +107,7 @@ WXPORT = 'gtk'     # On Linux/Unix there are several ports of wxWindows availabl
 
 BUILD_BASE = "build"       # Directory to use for temporary build files.
 
+CONTRIBS_INC = ""  # A dir to add as an -I flag when compiling the contribs
 
 
 # Some MSW build settings
@@ -190,7 +191,8 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
                 sys.argv[x] = ''
 
 # String options
-for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG']:
+for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
+               'CONTRIBS_INC']:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
             pos = sys.argv[x].find('=') + 1
@@ -591,7 +593,7 @@ elif os.name == 'posix':
 
 #----------------------------------------------------------------------
 else:
-    raise 'Sorry Charlie, platform not supported...'
+    raise 'Sorry, platform not supported...'
 
 
 #----------------------------------------------------------------------
@@ -836,7 +838,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_sound.i',         'src/_mimetype.i',
                           'src/_artprov.i',       'src/_config.i',
                           'src/_datetime.i',      'src/_dataobj.i',
-                          'src/_dnd.i',
+                          'src/_dnd.i',           'src/_display.i',
                           'src/_clipbrd.i',
                           ])
 ext = Extension('_misc', swig_sources,
@@ -914,8 +916,13 @@ ext = Extension('_wizard', swig_sources,
 wxpExtensions.append(ext)
 
 
+#----------------------------------------------------------------------
 
-
+if CONTRIBS_INC:
+    CONTRIBS_INC = [ CONTRIBS_INC ]
+else:
+    CONTRIBS_INC = []
+    
 
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
@@ -940,7 +947,7 @@ if BUILD_GLCANVAS:
     ext = Extension('_glcanvas',
                     swig_sources,
 
-                    include_dirs = includes,
+                    include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -973,7 +980,7 @@ if BUILD_OGL:
     ext = Extension('_ogl',
                     swig_sources,
 
-                    include_dirs =  includes + [ location ],
+                    include_dirs =  includes + [ location ] + CONTRIBS_INC,
                     define_macros = defines + [('wxUSE_DEPRECATED', '0')],
 
                     library_dirs = libdirs,
@@ -1023,7 +1030,7 @@ if BUILD_STC:
     ext = Extension('_stc',
                     swig_sources,
 
-                    include_dirs = includes,
+                    include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -1055,7 +1062,7 @@ if BUILD_IEWIN:
                                '%s/wxactivex.cpp' % location,
                              ] + swig_sources,
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -1089,7 +1096,7 @@ if BUILD_XRC:
     ext = Extension('_xrc',
                     swig_sources,
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -1117,7 +1124,7 @@ if BUILD_GIZMOS:
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % location ] + swig_sources,
 
-                    include_dirs =  includes + [ location ],
+                    include_dirs =  includes + [ location ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
@@ -1150,7 +1157,7 @@ if BUILD_DLLWIDGET:
                                 '%s/dllwidget.cpp' % location,
                              ] + swig_sources,
 
-                    include_dirs =  includes,
+                    include_dirs =  includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,