Updated to Scintilla 1.62
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.4 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -22,9 +22,10 @@ BCCDIR = $(MAKEDIR)\..
|
||||
### Variables: ###
|
||||
|
||||
WX_RELEASE_NODOT = 25
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
@@ -41,8 +42,8 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_CallTip.obj \
|
||||
$(OBJS)\stcdll_CellBuffer.obj \
|
||||
$(OBJS)\stcdll_ContractionState.obj \
|
||||
$(OBJS)\stcdll_DocumentAccessor.obj \
|
||||
$(OBJS)\stcdll_Document.obj \
|
||||
$(OBJS)\stcdll_DocumentAccessor.obj \
|
||||
$(OBJS)\stcdll_Editor.obj \
|
||||
$(OBJS)\stcdll_ExternalLexer.obj \
|
||||
$(OBJS)\stcdll_Indicator.obj \
|
||||
@@ -53,6 +54,7 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_LexAVE.obj \
|
||||
$(OBJS)\stcdll_LexAda.obj \
|
||||
$(OBJS)\stcdll_LexAsm.obj \
|
||||
$(OBJS)\stcdll_LexAsn1.obj \
|
||||
$(OBJS)\stcdll_LexBaan.obj \
|
||||
$(OBJS)\stcdll_LexBash.obj \
|
||||
$(OBJS)\stcdll_LexBullant.obj \
|
||||
@@ -91,14 +93,15 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_LexSpecman.obj \
|
||||
$(OBJS)\stcdll_LexTeX.obj \
|
||||
$(OBJS)\stcdll_LexVB.obj \
|
||||
$(OBJS)\stcdll_LexVHDL.obj \
|
||||
$(OBJS)\stcdll_LexVerilog.obj \
|
||||
$(OBJS)\stcdll_LexYAML.obj \
|
||||
$(OBJS)\stcdll_LineMarker.obj \
|
||||
$(OBJS)\stcdll_PropSet.obj \
|
||||
$(OBJS)\stcdll_RESearch.obj \
|
||||
$(OBJS)\stcdll_ScintillaBase.obj \
|
||||
$(OBJS)\stcdll_StyleContext.obj \
|
||||
$(OBJS)\stcdll_Style.obj \
|
||||
$(OBJS)\stcdll_StyleContext.obj \
|
||||
$(OBJS)\stcdll_UniConversion.obj \
|
||||
$(OBJS)\stcdll_ViewStyle.obj \
|
||||
$(OBJS)\stcdll_WindowAccessor.obj \
|
||||
@@ -117,8 +120,8 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_CallTip.obj \
|
||||
$(OBJS)\stclib_CellBuffer.obj \
|
||||
$(OBJS)\stclib_ContractionState.obj \
|
||||
$(OBJS)\stclib_DocumentAccessor.obj \
|
||||
$(OBJS)\stclib_Document.obj \
|
||||
$(OBJS)\stclib_DocumentAccessor.obj \
|
||||
$(OBJS)\stclib_Editor.obj \
|
||||
$(OBJS)\stclib_ExternalLexer.obj \
|
||||
$(OBJS)\stclib_Indicator.obj \
|
||||
@@ -129,6 +132,7 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_LexAVE.obj \
|
||||
$(OBJS)\stclib_LexAda.obj \
|
||||
$(OBJS)\stclib_LexAsm.obj \
|
||||
$(OBJS)\stclib_LexAsn1.obj \
|
||||
$(OBJS)\stclib_LexBaan.obj \
|
||||
$(OBJS)\stclib_LexBash.obj \
|
||||
$(OBJS)\stclib_LexBullant.obj \
|
||||
@@ -167,14 +171,15 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_LexSpecman.obj \
|
||||
$(OBJS)\stclib_LexTeX.obj \
|
||||
$(OBJS)\stclib_LexVB.obj \
|
||||
$(OBJS)\stclib_LexVHDL.obj \
|
||||
$(OBJS)\stclib_LexVerilog.obj \
|
||||
$(OBJS)\stclib_LexYAML.obj \
|
||||
$(OBJS)\stclib_LineMarker.obj \
|
||||
$(OBJS)\stclib_PropSet.obj \
|
||||
$(OBJS)\stclib_RESearch.obj \
|
||||
$(OBJS)\stclib_ScintillaBase.obj \
|
||||
$(OBJS)\stclib_StyleContext.obj \
|
||||
$(OBJS)\stclib_Style.obj \
|
||||
$(OBJS)\stclib_StyleContext.obj \
|
||||
$(OBJS)\stclib_UniConversion.obj \
|
||||
$(OBJS)\stclib_ViewStyle.obj \
|
||||
$(OBJS)\stclib_WindowAccessor.obj \
|
||||
@@ -209,6 +214,12 @@ WXUNIVNAME = univ
|
||||
!if "$(SHARED)" == "1"
|
||||
WXDLLFLAG = dll
|
||||
!endif
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBTYPE_SUFFIX = lib
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBTYPE_SUFFIX = dll
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
EXTRALIBS_FOR_BASE =
|
||||
!endif
|
||||
@@ -289,12 +300,6 @@ __DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
!if "$(UNICODE)" == "1"
|
||||
__UNICODE_DEFINE_p = -D_UNICODE
|
||||
!endif
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\bcc_lib$(CFG)
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\bcc_dll$(CFG)
|
||||
!endif
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
@@ -308,6 +313,7 @@ all: $(__stcdll___depname) $(__stclib___depname)
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).tds
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).ilc
|
||||
@@ -354,10 +360,10 @@ $(OBJS)\stcdll_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx
|
||||
$(OBJS)\stcdll_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx
|
||||
$(OBJS)\stcdll_Document.obj: ../../src/stc\scintilla\src\Document.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_Document.obj: ../../src/stc\scintilla\src\Document.cxx
|
||||
$(OBJS)\stcdll_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx
|
||||
@@ -390,6 +396,9 @@ $(OBJS)\stcdll_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx
|
||||
$(OBJS)\stcdll_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_LexAsn1.obj: ../../src/stc\scintilla\src\LexAsn1.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
@@ -504,6 +513,9 @@ $(OBJS)\stcdll_LexTeX.obj: ../../src/stc\scintilla\src\LexTeX.cxx
|
||||
$(OBJS)\stcdll_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_LexVHDL.obj: ../../src/stc\scintilla\src\LexVHDL.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_LexVerilog.obj: ../../src/stc\scintilla\src\LexVerilog.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
@@ -522,10 +534,10 @@ $(OBJS)\stcdll_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx
|
||||
$(OBJS)\stcdll_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx
|
||||
$(OBJS)\stcdll_Style.obj: ../../src/stc\scintilla\src\Style.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_Style.obj: ../../src/stc\scintilla\src\Style.cxx
|
||||
$(OBJS)\stcdll_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stcdll_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx
|
||||
@@ -561,10 +573,10 @@ $(OBJS)\stclib_CellBuffer.obj: ../../src/stc\scintilla\src\CellBuffer.cxx
|
||||
$(OBJS)\stclib_ContractionState.obj: ../../src/stc\scintilla\src\ContractionState.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx
|
||||
$(OBJS)\stclib_Document.obj: ../../src/stc\scintilla\src\Document.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_Document.obj: ../../src/stc\scintilla\src\Document.cxx
|
||||
$(OBJS)\stclib_DocumentAccessor.obj: ../../src/stc\scintilla\src\DocumentAccessor.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_Editor.obj: ../../src/stc\scintilla\src\Editor.cxx
|
||||
@@ -597,6 +609,9 @@ $(OBJS)\stclib_LexAda.obj: ../../src/stc\scintilla\src\LexAda.cxx
|
||||
$(OBJS)\stclib_LexAsm.obj: ../../src/stc\scintilla\src\LexAsm.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_LexAsn1.obj: ../../src/stc\scintilla\src\LexAsn1.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_LexBaan.obj: ../../src/stc\scintilla\src\LexBaan.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
@@ -711,6 +726,9 @@ $(OBJS)\stclib_LexTeX.obj: ../../src/stc\scintilla\src\LexTeX.cxx
|
||||
$(OBJS)\stclib_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_LexVHDL.obj: ../../src/stc\scintilla\src\LexVHDL.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_LexVerilog.obj: ../../src/stc\scintilla\src\LexVerilog.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
@@ -729,10 +747,10 @@ $(OBJS)\stclib_RESearch.obj: ../../src/stc\scintilla\src\RESearch.cxx
|
||||
$(OBJS)\stclib_ScintillaBase.obj: ../../src/stc\scintilla\src\ScintillaBase.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx
|
||||
$(OBJS)\stclib_Style.obj: ../../src/stc\scintilla\src\Style.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_Style.obj: ../../src/stc\scintilla\src\Style.cxx
|
||||
$(OBJS)\stclib_StyleContext.obj: ../../src/stc\scintilla\src\StyleContext.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\stclib_UniConversion.obj: ../../src/stc\scintilla\src\UniConversion.cxx
|
||||
@@ -746,3 +764,4 @@ $(OBJS)\stclib_WindowAccessor.obj: ../../src/stc\scintilla\src\WindowAccessor.cx
|
||||
|
||||
$(OBJS)\stclib_XPM.obj: ../../src/stc\scintilla\src\XPM.cxx
|
||||
$(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) $**
|
||||
|
||||
|
||||
Reference in New Issue
Block a user