Some build updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,6 +12,7 @@ OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
|
|||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
|
OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
|
||||||
else:
|
else:
|
||||||
|
OTHERLFLAGS='-v'
|
||||||
SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
|
SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
|
||||||
print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
|
print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
|
||||||
" if you have native GL!"
|
" if you have native GL!"
|
||||||
|
@@ -1093,6 +1093,7 @@ void glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
|
|||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
%init %{
|
%init %{
|
||||||
|
|
||||||
wxClassInfo::CleanUpClasses();
|
wxClassInfo::CleanUpClasses();
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
*
|
*
|
||||||
* This file was automatically generated by :
|
* This file was automatically generated by :
|
||||||
* Simplified Wrapper and Interface Generator (SWIG)
|
* Simplified Wrapper and Interface Generator (SWIG)
|
||||||
* Version 1.1 (Build 798)
|
* Version 1.1 (Patch 6)
|
||||||
*
|
*
|
||||||
* Portions Copyright (c) 1995-1998
|
* Portions Copyright (c) 1995-1998
|
||||||
* The University of Utah and The Regents of the University of California.
|
* The University of Utah and The Regents of the University of California.
|
||||||
|
@@ -23,7 +23,7 @@ dist:
|
|||||||
|
|
||||||
else:
|
else:
|
||||||
DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
|
DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
|
||||||
OTHERINSTALLTARGETS = 'installHelpers installLibDemo'
|
OTHERINSTALLTARGETS = 'installLibDemo installHelpers '
|
||||||
|
|
||||||
|
|
||||||
OTHERRULES = """
|
OTHERRULES = """
|
||||||
@@ -55,8 +55,8 @@ installLibDemo:
|
|||||||
cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\
|
cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\
|
||||||
cp ../demo/*.txt $(TARGETDIR)/demo; \\
|
cp ../demo/*.txt $(TARGETDIR)/demo; \\
|
||||||
cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps; \\
|
cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps; \\
|
||||||
$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR); \\
|
$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\
|
||||||
$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR); \\
|
$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR); \\
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user