compilation error fix (trailing comma in an enum)

[wxWidgets.git] / wxPython / my_distutils.py

diff --git a/wxPython/my_distutils.py b/wxPython/my_distutils.py
index aa0c183e6b7052239ce905adb0adee52700134d4..f1603f4f5f6d0673f65157de73181c0cd656fb74 100644 (file)
--- a/wxPython/my_distutils.py
+++ b/wxPython/my_distutils.py
@@ -14,6 +14,24 @@ from distutils.ccompiler import \
 
 class MyMSVCCompiler(MSVCCompiler):
 
+##     def __init__ (self,
+##                   verbose=0,
+##                   dry_run=0,
+##                   force=0):
+##         MSVCCompiler.__init__(self, verbose, dry_run, force)
+
+##         self.compile_options = [ '/nologo',
+##                                  '/Ox',
+##                                  '/MD',
+##                                  '/W3',
+##                                  '/GX',
+##                                  ]
+##         self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GX',
+##                                       '/Z7', '/D_DEBUG']
+
+
+
+
     ##------------------------------------------------------------
     ## Override the entire compile method just to add flags to the
     ## RC command.  There should be an easier way to do this from
@@ -54,15 +72,15 @@ class MyMSVCCompiler(MSVCCompiler):
                 self.mkpath (os.path.dirname (obj))
 
                 if ext in self._c_extensions:
-                    input_opt = "/Tc" + os.path.abspath(src)
+                    input_opt = "/Tc" + os.path.abspath(src)    ### RPD
                 elif ext in self._cpp_extensions:
-                    input_opt = "/Tp" + os.path.abspath(src)
+                    input_opt = "/Tp" + os.path.abspath(src)    ### RPD
                 elif ext in self._rc_extensions:
                     # compile .RC to .RES file
                     input_opt = src
                     output_opt = "/fo" + obj
                     try:
-                        self.spawn ([self.rc] + pp_opts +         ### RPD changed this line only
+                        self.spawn ([self.rc] + pp_opts +         ### RPD changed this line
                                     [output_opt] + [input_opt])
                     except DistutilsExecError, msg:
                         raise CompileError, msg
@@ -447,7 +465,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
                 cpp_file = string.join(string.split(cpp_file, '\\'), '/')
                 i_file = string.join(string.split(i_file, '\\'), '/')
 
-                cmd = ['swig'] + swig_args + ['-I'+dir, '-c', '-o', cpp_file, i_file]
+                cmd = ['./wxSWIG/wxswig'] + swig_args + ['-I'+dir, '-c', '-o', cpp_file, i_file]
                 spawn(cmd, verbose=1)
 
         # copy the generated python file to the package directory