From fd4ff3bf16b71f8d3896dd17ff9a579a07e3a088 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 1 Sep 1999 20:54:34 +0000
Subject: [PATCH] Some build updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/wxPython/modules/glcanvas/build.cfg        | 1 +
 utils/wxPython/modules/glcanvas/glcanvas.i       | 1 +
 utils/wxPython/modules/glcanvas/gtk/glcanvas.cpp | 2 +-
 utils/wxPython/src/build.cfg                     | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index fb9ad4b057..5590226076 100644
--- 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 f6eb0fbd68..cf954dc322 100644
--- 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 70e0273aea..7d28241cc8 100644
--- 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 bb3a32caf9..47bfffa6b4 100644
--- 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
 
 
-- 
2.45.2