Some build updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index fb9ad4b057200a4cd90a8764e6df54812dbff5a6..55902260769979d1d39c94dccc54c0a83bc3fb92 100644 (file)
--- a/utils/wxPython/modules/glcanvas/build.cfg
+++ b/utils/wxPython/modules/glcanvas/build.cfg
@@ -12,6 +12,7 @@ OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
 else:
+    OTHERLFLAGS='-v'
     SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
     print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
           "         if you have native GL!"

diff --git a/utils/wxPython/modules/glcanvas/glcanvas.i b/utils/wxPython/modules/glcanvas/glcanvas.i
index f6eb0fbd681fa88fa9301c2daa064493e04f8662..cf954dc322c88f75f75874b511032269017c3e6a 100644 (file)
--- a/utils/wxPython/modules/glcanvas/glcanvas.i
+++ b/utils/wxPython/modules/glcanvas/glcanvas.i
@@ -1093,6 +1093,7 @@ void glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
 
 //---------------------------------------------------------------------------
 
+
 %init %{
 
     wxClassInfo::CleanUpClasses();

diff --git a/utils/wxPython/modules/glcanvas/gtk/glcanvas.cpp b/utils/wxPython/modules/glcanvas/gtk/glcanvas.cpp
index 70e0273aeaa6b6286c9cb5b0171fc05527704deb..7d28241cc8f72baafbe742f06d2771aaa5821575 100644 (file)
--- a/utils/wxPython/modules/glcanvas/gtk/glcanvas.cpp
+++ b/utils/wxPython/modules/glcanvas/gtk/glcanvas.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Build 798)
+ * Version 1.1 (Patch 6)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.

diff --git a/utils/wxPython/src/build.cfg b/utils/wxPython/src/build.cfg
index bb3a32caf9dcf95c895768271337ea144afe30e4..47bfffa6b41641c8f7511d9346b1ea87e621e293 100644 (file)
--- a/utils/wxPython/src/build.cfg
+++ b/utils/wxPython/src/build.cfg
@@ -23,7 +23,7 @@ dist:
 
 else:
     DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
-    OTHERINSTALLTARGETS = 'installHelpers installLibDemo'
+    OTHERINSTALLTARGETS = 'installLibDemo installHelpers '
 
 
     OTHERRULES = """
@@ -55,8 +55,8 @@ installLibDemo:
                cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\
                cp ../demo/*.txt $(TARGETDIR)/demo;             \\
                cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps;    \\
-               $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR); \\
-               $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR); \\
+               $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\
+               $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR); \\
        fi