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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -13,18 +13,19 @@ include ../../../build/msw/config.gcc
|
||||
### Variables: ###
|
||||
|
||||
WX_RELEASE_NODOT = 25
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -W -Wall \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
|
||||
STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_PlatWX.o \
|
||||
$(OBJS)\stcdll_ScintillaWX.o \
|
||||
@@ -33,8 +34,8 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_CallTip.o \
|
||||
$(OBJS)\stcdll_CellBuffer.o \
|
||||
$(OBJS)\stcdll_ContractionState.o \
|
||||
$(OBJS)\stcdll_DocumentAccessor.o \
|
||||
$(OBJS)\stcdll_Document.o \
|
||||
$(OBJS)\stcdll_DocumentAccessor.o \
|
||||
$(OBJS)\stcdll_Editor.o \
|
||||
$(OBJS)\stcdll_ExternalLexer.o \
|
||||
$(OBJS)\stcdll_Indicator.o \
|
||||
@@ -45,6 +46,7 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_LexAVE.o \
|
||||
$(OBJS)\stcdll_LexAda.o \
|
||||
$(OBJS)\stcdll_LexAsm.o \
|
||||
$(OBJS)\stcdll_LexAsn1.o \
|
||||
$(OBJS)\stcdll_LexBaan.o \
|
||||
$(OBJS)\stcdll_LexBash.o \
|
||||
$(OBJS)\stcdll_LexBullant.o \
|
||||
@@ -83,24 +85,26 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_LexSpecman.o \
|
||||
$(OBJS)\stcdll_LexTeX.o \
|
||||
$(OBJS)\stcdll_LexVB.o \
|
||||
$(OBJS)\stcdll_LexVHDL.o \
|
||||
$(OBJS)\stcdll_LexVerilog.o \
|
||||
$(OBJS)\stcdll_LexYAML.o \
|
||||
$(OBJS)\stcdll_LineMarker.o \
|
||||
$(OBJS)\stcdll_PropSet.o \
|
||||
$(OBJS)\stcdll_RESearch.o \
|
||||
$(OBJS)\stcdll_ScintillaBase.o \
|
||||
$(OBJS)\stcdll_StyleContext.o \
|
||||
$(OBJS)\stcdll_Style.o \
|
||||
$(OBJS)\stcdll_StyleContext.o \
|
||||
$(OBJS)\stcdll_UniConversion.o \
|
||||
$(OBJS)\stcdll_ViewStyle.o \
|
||||
$(OBJS)\stcdll_WindowAccessor.o \
|
||||
$(OBJS)\stcdll_XPM.o
|
||||
STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -W -Wall \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) -Wno-ctor-dtor-privacy \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_PlatWX.o \
|
||||
$(OBJS)\stclib_ScintillaWX.o \
|
||||
@@ -109,8 +113,8 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_CallTip.o \
|
||||
$(OBJS)\stclib_CellBuffer.o \
|
||||
$(OBJS)\stclib_ContractionState.o \
|
||||
$(OBJS)\stclib_DocumentAccessor.o \
|
||||
$(OBJS)\stclib_Document.o \
|
||||
$(OBJS)\stclib_DocumentAccessor.o \
|
||||
$(OBJS)\stclib_Editor.o \
|
||||
$(OBJS)\stclib_ExternalLexer.o \
|
||||
$(OBJS)\stclib_Indicator.o \
|
||||
@@ -121,6 +125,7 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_LexAVE.o \
|
||||
$(OBJS)\stclib_LexAda.o \
|
||||
$(OBJS)\stclib_LexAsm.o \
|
||||
$(OBJS)\stclib_LexAsn1.o \
|
||||
$(OBJS)\stclib_LexBaan.o \
|
||||
$(OBJS)\stclib_LexBash.o \
|
||||
$(OBJS)\stclib_LexBullant.o \
|
||||
@@ -159,14 +164,15 @@ STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_LexSpecman.o \
|
||||
$(OBJS)\stclib_LexTeX.o \
|
||||
$(OBJS)\stclib_LexVB.o \
|
||||
$(OBJS)\stclib_LexVHDL.o \
|
||||
$(OBJS)\stclib_LexVerilog.o \
|
||||
$(OBJS)\stclib_LexYAML.o \
|
||||
$(OBJS)\stclib_LineMarker.o \
|
||||
$(OBJS)\stclib_PropSet.o \
|
||||
$(OBJS)\stclib_RESearch.o \
|
||||
$(OBJS)\stclib_ScintillaBase.o \
|
||||
$(OBJS)\stclib_StyleContext.o \
|
||||
$(OBJS)\stclib_Style.o \
|
||||
$(OBJS)\stclib_StyleContext.o \
|
||||
$(OBJS)\stclib_UniConversion.o \
|
||||
$(OBJS)\stclib_ViewStyle.o \
|
||||
$(OBJS)\stclib_WindowAccessor.o \
|
||||
@@ -206,6 +212,12 @@ endif
|
||||
ifeq ($(SHARED),1)
|
||||
WXDLLFLAG = dll
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
LIBTYPE_SUFFIX = lib
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
LIBTYPE_SUFFIX = dll
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
@@ -292,12 +304,6 @@ endif
|
||||
ifeq ($(UNICODE),1)
|
||||
__UNICODE_DEFINE_p = -D_UNICODE
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_lib$(CFG)
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_dll$(CFG)
|
||||
endif
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
@@ -316,7 +322,7 @@ clean:
|
||||
|
||||
ifeq ($(SHARED),1)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
|
||||
$(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
|
||||
$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
@@ -347,10 +353,10 @@ $(OBJS)\stcdll_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx
|
||||
$(OBJS)\stcdll_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
|
||||
$(OBJS)\stcdll_Document.o: ../../src/stc/scintilla/src/Document.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_Document.o: ../../src/stc/scintilla/src/Document.cxx
|
||||
$(OBJS)\stcdll_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
|
||||
@@ -383,6 +389,9 @@ $(OBJS)\stcdll_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
|
||||
$(OBJS)\stcdll_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_LexAsn1.o: ../../src/stc/scintilla/src/LexAsn1.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -497,6 +506,9 @@ $(OBJS)\stcdll_LexTeX.o: ../../src/stc/scintilla/src/LexTeX.cxx
|
||||
$(OBJS)\stcdll_LexVB.o: ../../src/stc/scintilla/src/LexVB.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_LexVHDL.o: ../../src/stc/scintilla/src/LexVHDL.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_LexVerilog.o: ../../src/stc/scintilla/src/LexVerilog.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -515,10 +527,10 @@ $(OBJS)\stcdll_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx
|
||||
$(OBJS)\stcdll_ScintillaBase.o: ../../src/stc/scintilla/src/ScintillaBase.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
|
||||
$(OBJS)\stcdll_Style.o: ../../src/stc/scintilla/src/Style.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_Style.o: ../../src/stc/scintilla/src/Style.cxx
|
||||
$(OBJS)\stcdll_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
|
||||
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stcdll_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx
|
||||
@@ -554,10 +566,10 @@ $(OBJS)\stclib_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx
|
||||
$(OBJS)\stclib_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
|
||||
$(OBJS)\stclib_Document.o: ../../src/stc/scintilla/src/Document.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_Document.o: ../../src/stc/scintilla/src/Document.cxx
|
||||
$(OBJS)\stclib_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
|
||||
@@ -590,6 +602,9 @@ $(OBJS)\stclib_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
|
||||
$(OBJS)\stclib_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_LexAsn1.o: ../../src/stc/scintilla/src/LexAsn1.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -704,6 +719,9 @@ $(OBJS)\stclib_LexTeX.o: ../../src/stc/scintilla/src/LexTeX.cxx
|
||||
$(OBJS)\stclib_LexVB.o: ../../src/stc/scintilla/src/LexVB.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_LexVHDL.o: ../../src/stc/scintilla/src/LexVHDL.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_LexVerilog.o: ../../src/stc/scintilla/src/LexVerilog.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -722,10 +740,10 @@ $(OBJS)\stclib_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx
|
||||
$(OBJS)\stclib_ScintillaBase.o: ../../src/stc/scintilla/src/ScintillaBase.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
|
||||
$(OBJS)\stclib_Style.o: ../../src/stc/scintilla/src/Style.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_Style.o: ../../src/stc/scintilla/src/Style.cxx
|
||||
$(OBJS)\stclib_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\stclib_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx
|
||||
@@ -741,3 +759,4 @@ $(OBJS)\stclib_XPM.o: ../../src/stc/scintilla/src/XPM.cxx
|
||||
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
||||
Reference in New Issue
Block a user