Too quick a trigger finger first time. Compile error fixed.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 5cc81bb8914ebdc8a33e3197defc27d684ab4e3b..d3fdd3e56e5d7f0fbc43ce9625c51988f9782dee 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -73,6 +73,15 @@ wxpExtensions = []
 force = '--force' in sys.argv or '-f' in sys.argv
 debug = '--debug' in sys.argv or '-g' in sys.argv
 
+bcpp_compiling = '-c' in sys.argv and 'my_bcpp' in sys.argv # Bad heuristic
+
+if bcpp_compiling:
+    print "Compiling wxPython by Borland C/C++ Compiler"
+    HYBRID=0
+    WXBCPPLIBVER = string.replace(WXDLLVER,"_","")
+    # Version part of BCPP build LIBRARY name
+    WXDLLVER="" # no dll ver path avaible
+
 
 #----------------------------------------------------------------------
 # Check for build flags on the command line
@@ -142,6 +151,23 @@ if os.name == 'nt':
                 ('WXP_USE_THREAD', '1'),
                 ]
 
+    if bcpp_compiling:  # overwrite it
+        defines = [
+            ('_WINDOWS', None),
+            ('WINVER', '0x0400'),
+            ('STRICT', None),
+
+            ('WXUSINGDLL', '1'),
+
+            ('SWIG_GLOBAL', None),
+            ('HAVE_CONFIG_H', None),
+            ('WXP_USE_THREAD', '1'),
+
+            ('WXUSE_DEFINE','1'),
+            ('_RTLDLL',None),
+            ]
+
+
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
@@ -155,18 +181,37 @@ if os.name == 'nt':
         wxdll = 'wx' + WXDLLVER + 'd'
 
 
-    libs = [wxdll, 'kernel32', 'user32', 'gdi32', 'comdlg32',
+    libs = [wxdll]
+    if bcpp_compiling:
+        libs = ['wx'+WXBCPPLIBVER]
+
+    libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
             'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',
             'advapi32', 'wsock32']
 
-    cflags = ['/GX-']  # workaround for internal compiler error in MSVC 5
+
+    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC 5
     lflags = None
 
-    if not FINAL and HYBRID:
+
+    if bcpp_compiling:  # overwrite it
+        cflags = ['-5', '-VF',  ### To supplort MSVC spurious semicolons in the class scope
+                  ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
+                  '-Hc', '-H='+WXDIR+'\src\msw\wx32.csm',
+                  '@'+WXDIR+'\src\msw\wxwin32.cfg'
+                  ]
+
+
+    if not FINAL and HYBRID and not bcpp_compiling:
         cflags = cflags + ['/Od', '/Z7']
         lflags = ['/DEBUG', ]
 
+    elif bcpp_compiling and not FINAL:
+        cflags = cflags + ['/Od', '/v', '/y']
+        lflags = lflags + ['/v', ]   ## '/PDB:NONE']
+
+
 
 elif os.name == 'posix':
     # Set flags for Unix type platforms
@@ -327,6 +372,7 @@ if BUILD_GLCANVAS or GL_ONLY:
     print 'Preparing GLCANVAS...'
     location = 'contrib/glcanvas'
     swig_files = ['glcanvas.i']
+    other_sources = []
 
     swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args)
@@ -337,9 +383,13 @@ if BUILD_GLCANVAS or GL_ONLY:
             gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
         else:
             gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
+    else:
+        other_sources = [location + '/msw/myglcanvas.cpp']
+        gl_libs = ['opengl32', 'glu32']
+
 
     ext = Extension('glcanvasc',
-                    swig_sources,
+                    swig_sources + other_sources,
 
                     include_dirs = includes,
                     define_macros = defines,