applied patch 475879 (Can't use subclassed GridCellEditor)

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 516529fdce93f880dfc65a755ca17d16d4ccfaa3..27f7138ff3655db70ca683a9a47cfca575080e31 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -232,6 +232,29 @@ if os.name == 'nt':
 
 
 
+elif os.name == 'posix' and sys.platform == "darwin1":
+    # Flags and such for a Darwin (Max OS X) build of Python
+
+    WXDIR = '..'              # assumes IN_CVS_TREE
+    WXPLAT = '__WXMAC__'
+    GENDIR = 'mac'
+
+    includes = ['src']
+    defines = [('SWIG_GLOBAL', None),
+               ('HAVE_CONFIG_H', None),
+               ('WXP_USE_THREAD', '1'),
+               ]
+    libdirs = []
+    libs = []
+
+    cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
+    cflags = string.split(cflags)
+
+    lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+    lflags = string.split(lflags)
+
+
+
 elif os.name == 'posix':
     # Set flags for Unix type platforms
 
@@ -277,7 +300,8 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword',
              '-dnone',
              #'-dascii',
              #'-docstring', '-Sbefore',
-             '-I./src', '-D'+WXPLAT]
+             '-I./src', '-D'+WXPLAT,
+             ]
 swig_deps = ['src/my_typemaps.i']
 
 
@@ -523,7 +547,7 @@ if not GL_ONLY and BUILD_STC:
 
 
     swig_files = ['stc_.i']
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')])