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

@@ -7,49 +7,63 @@ SOURCES = []
PYFILES = ['stc.py']
OTHERSWIGFLAGS = '-I$(WXWIN)/contrib/include/wx/stc'
OTHERSWIGFLAGS = '-I$(STCLOC)/contrib/include/wx/stc'
SWIGDEPS = '$(STCLOC)/contrib/include/wx/stc/stc.h'
SOURCES = SOURCES + [
'$(STCLOC)/contrib/src/stc/scintilla/src/AutoComplete.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/CallTip.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/CellBuffer.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/ContractionState.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/Document.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/Editor.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/Indicator.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/KeyMap.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/KeyWords.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LineMarker.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/PropSet.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/ScintillaBase.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/Style.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/ViewStyle.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexCPP.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexHTML.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexOthers.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexPerl.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexPython.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexSQL.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/LexVB.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/DocumentAccessor.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/UniConversion.cxx',
'$(STCLOC)/contrib/src/stc/scintilla/src/WindowAccessor.cxx',
'$(STCLOC)/contrib/src/stc/PlatWX.cpp',
'$(STCLOC)/contrib/src/stc/ScintillaWX.cpp',
'$(STCLOC)/contrib/src/stc/stc.cpp',
]
OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
'-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
'-I$(STCLOC)/contrib/include ' + \
'-I$(STCLOC)/contrib/src/stc/scintilla/src'
SWIGDEPS = '$(WXWIN)/contrib/include/wx/stc/stc.h'
if sys.platform == 'win32':
OTHERCFLAGS = '-I$(WXWIN)/contrib/include'
OTHERLIBS = '$(WXWIN)/contrib/lib/stc$(LIBEXT).lib'
OTHERDEFS = 'STCLOC = $(WXWIN)'
OTHERRULES = '''
{$(WXWIN)/contrib/src/stc}.cpp{}.obj:
$(cc) @<<
$(CPPFLAGS) /c /Tp $<
<<
{$(WXWIN)/contrib/src/stc/scintilla/src}.cxx{}.obj:
$(cc) @<<
$(CPPFLAGS) /c /Tp $<
<<
'''
else:
OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
'-Icontrib/src/stc/scintilla/include -Icontrib/include ' + \
'-Icontrib/src/stc/scintilla/src'
SOURCES = SOURCES + [
'contrib/src/stc/scintilla/src/AutoComplete.cxx',
'contrib/src/stc/scintilla/src/CallTip.cxx',
'contrib/src/stc/scintilla/src/CellBuffer.cxx',
'contrib/src/stc/scintilla/src/ContractionState.cxx',
'contrib/src/stc/scintilla/src/Document.cxx',
'contrib/src/stc/scintilla/src/Editor.cxx',
'contrib/src/stc/scintilla/src/Indicator.cxx',
'contrib/src/stc/scintilla/src/KeyMap.cxx',
'contrib/src/stc/scintilla/src/KeyWords.cxx',
'contrib/src/stc/scintilla/src/LineMarker.cxx',
'contrib/src/stc/scintilla/src/PropSet.cxx',
'contrib/src/stc/scintilla/src/ScintillaBase.cxx',
'contrib/src/stc/scintilla/src/Style.cxx',
'contrib/src/stc/scintilla/src/ViewStyle.cxx',
'contrib/src/stc/scintilla/src/LexCPP.cxx',
'contrib/src/stc/scintilla/src/LexHTML.cxx',
'contrib/src/stc/scintilla/src/LexOthers.cxx',
'contrib/src/stc/scintilla/src/LexPerl.cxx',
'contrib/src/stc/scintilla/src/LexPython.cxx',
'contrib/src/stc/scintilla/src/LexSQL.cxx',
'contrib/src/stc/scintilla/src/LexVB.cxx',
'contrib/src/stc/scintilla/src/DocumentAccessor.cxx',
'contrib/src/stc/scintilla/src/UniConversion.cxx',
'contrib/src/stc/scintilla/src/WindowAccessor.cxx',
'contrib/src/stc/PlatWX.cpp',
'contrib/src/stc/ScintillaWX.cpp',
'contrib/src/stc/stc.cpp',
]
DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
OTHERDEFS = 'STCLOC = .'
OTHERRULES = """
%.o : contrib/src/stc/%.cpp
$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<