added grid sizers

changed some build configurations


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-05-11 19:30:19 +00:00
parent 08392f16cc
commit 44faee407c
11 changed files with 1241 additions and 69 deletions

View File

@@ -6,30 +6,33 @@ SWIGFILES = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', 'oglcanvas.i'
SOURCES = ['oglhelpers.cpp']
OTHERCFLAGS = '-I$(WXWIN)/contrib/include'
OTHERCFLAGS = '-I$(STCLOC)/contrib/include'
SOURCES = SOURCES + [
'$(STCLOC)/contrib/src/ogl/basic.cpp',
'$(STCLOC)/contrib/src/ogl/bmpshape.cpp',
'$(STCLOC)/contrib/src/ogl/composit.cpp',
'$(STCLOC)/contrib/src/ogl/divided.cpp',
'$(STCLOC)/contrib/src/ogl/lines.cpp',
'$(STCLOC)/contrib/src/ogl/misc.cpp',
'$(STCLOC)/contrib/src/ogl/basic2.cpp',
'$(STCLOC)/contrib/src/ogl/canvas.cpp',
'$(STCLOC)/contrib/src/ogl/constrnt.cpp',
'$(STCLOC)/contrib/src/ogl/drawn.cpp',
'$(STCLOC)/contrib/src/ogl/mfutils.cpp',
'$(STCLOC)/contrib/src/ogl/ogldiag.cpp',
]
if sys.platform == 'win32':
OTHERCFLAGS = '-I$(WXWIN)/contrib/include'
OTHERLIBS = '$(WXWIN)/contrib/lib/ogl$(LIBEXT).lib'
OTHERDEFS = 'STCLOC = $(WXWIN)'
OTHERRULES = '''
{$(WXWIN)/contrib/src/ogl}.cpp{}.obj:
$(cc) @<<
$(CPPFLAGS) /c /Tp $<
<<
'''
else:
OTHERCFLAGS = '-Icontrib/include'
SOURCES = SOURCES + [
'contrib/src/ogl/basic.cpp',
'contrib/src/ogl/bmpshape.cpp',
'contrib/src/ogl/composit.cpp',
'contrib/src/ogl/divided.cpp',
'contrib/src/ogl/lines.cpp',
'contrib/src/ogl/misc.cpp',
'contrib/src/ogl/basic2.cpp',
'contrib/src/ogl/canvas.cpp',
'contrib/src/ogl/constrnt.cpp',
'contrib/src/ogl/drawn.cpp',
'contrib/src/ogl/mfutils.cpp',
'contrib/src/ogl/ogldiag.cpp',
]
DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
OTHERRULES = """
%.o : contrib/src/ogl/%.cpp
$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<