X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..de59c1618f4cdca1172e7bfb5d61de1956aba41c:/contrib/build/stc/makefile.gcc

diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index d4060d56f6..8c23340b2c 100644
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -16,12 +16,13 @@ OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
+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..\..\src\stc\scintilla\include \
 	-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-	-DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS)
+	-DWXUSINGDLL -DWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+	$(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  \
 	$(OBJS)\stcdll_PlatWX.o \
 	$(OBJS)\stcdll_ScintillaWX.o \
@@ -30,53 +31,66 @@ STCDLL_OBJECTS =  \
 	$(OBJS)\stcdll_CallTip.o \
 	$(OBJS)\stcdll_CellBuffer.o \
 	$(OBJS)\stcdll_ContractionState.o \
-	$(OBJS)\stcdll_Document.o \
 	$(OBJS)\stcdll_DocumentAccessor.o \
+	$(OBJS)\stcdll_Document.o \
 	$(OBJS)\stcdll_Editor.o \
 	$(OBJS)\stcdll_ExternalLexer.o \
 	$(OBJS)\stcdll_Indicator.o \
 	$(OBJS)\stcdll_KeyMap.o \
 	$(OBJS)\stcdll_KeyWords.o \
-	$(OBJS)\stcdll_LexAVE.o \
 	$(OBJS)\stcdll_LexAda.o \
 	$(OBJS)\stcdll_LexAsm.o \
+	$(OBJS)\stcdll_LexAVE.o \
 	$(OBJS)\stcdll_LexBaan.o \
 	$(OBJS)\stcdll_LexBullant.o \
-	$(OBJS)\stcdll_LexCPP.o \
-	$(OBJS)\stcdll_LexCSS.o \
+	$(OBJS)\stcdll_LexCLW.o \
 	$(OBJS)\stcdll_LexConf.o \
+	$(OBJS)\stcdll_LexCPP.o \
 	$(OBJS)\stcdll_LexCrontab.o \
+	$(OBJS)\stcdll_LexCSS.o \
 	$(OBJS)\stcdll_LexEiffel.o \
+	$(OBJS)\stcdll_LexErlang.o \
 	$(OBJS)\stcdll_LexEScript.o \
+	$(OBJS)\stcdll_LexForth.o \
 	$(OBJS)\stcdll_LexFortran.o \
 	$(OBJS)\stcdll_LexHTML.o \
 	$(OBJS)\stcdll_LexLisp.o \
 	$(OBJS)\stcdll_LexLout.o \
 	$(OBJS)\stcdll_LexLua.o \
 	$(OBJS)\stcdll_LexMatlab.o \
+	$(OBJS)\stcdll_LexMetapost.o \
+	$(OBJS)\stcdll_LexMMIXAL.o \
+	$(OBJS)\stcdll_LexMPT.o \
+	$(OBJS)\stcdll_LexNsis.o \
 	$(OBJS)\stcdll_LexOthers.o \
-	$(OBJS)\stcdll_LexPOV.o \
 	$(OBJS)\stcdll_LexPascal.o \
+	$(OBJS)\stcdll_LexPB.o \
 	$(OBJS)\stcdll_LexPerl.o \
+	$(OBJS)\stcdll_LexPOV.o \
+	$(OBJS)\stcdll_LexPS.o \
 	$(OBJS)\stcdll_LexPython.o \
 	$(OBJS)\stcdll_LexRuby.o \
+	$(OBJS)\stcdll_LexScriptol.o \
 	$(OBJS)\stcdll_LexSQL.o \
+	$(OBJS)\stcdll_LexTeX.o \
 	$(OBJS)\stcdll_LexVB.o \
+	$(OBJS)\stcdll_LexYAML.o \
 	$(OBJS)\stcdll_LineMarker.o \
 	$(OBJS)\stcdll_PropSet.o \
 	$(OBJS)\stcdll_RESearch.o \
 	$(OBJS)\stcdll_ScintillaBase.o \
-	$(OBJS)\stcdll_Style.o \
 	$(OBJS)\stcdll_StyleContext.o \
+	$(OBJS)\stcdll_Style.o \
 	$(OBJS)\stcdll_UniConversion.o \
 	$(OBJS)\stcdll_ViewStyle.o \
 	$(OBJS)\stcdll_WindowAccessor.o \
 	$(OBJS)\stcdll_XPM.o
-STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
+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..\..\src\stc\scintilla\include \
-	-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
+	-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 STCLIB_OBJECTS =  \
 	$(OBJS)\stclib_PlatWX.o \
 	$(OBJS)\stclib_ScintillaWX.o \
@@ -85,44 +99,56 @@ STCLIB_OBJECTS =  \
 	$(OBJS)\stclib_CallTip.o \
 	$(OBJS)\stclib_CellBuffer.o \
 	$(OBJS)\stclib_ContractionState.o \
-	$(OBJS)\stclib_Document.o \
 	$(OBJS)\stclib_DocumentAccessor.o \
+	$(OBJS)\stclib_Document.o \
 	$(OBJS)\stclib_Editor.o \
 	$(OBJS)\stclib_ExternalLexer.o \
 	$(OBJS)\stclib_Indicator.o \
 	$(OBJS)\stclib_KeyMap.o \
 	$(OBJS)\stclib_KeyWords.o \
-	$(OBJS)\stclib_LexAVE.o \
 	$(OBJS)\stclib_LexAda.o \
 	$(OBJS)\stclib_LexAsm.o \
+	$(OBJS)\stclib_LexAVE.o \
 	$(OBJS)\stclib_LexBaan.o \
 	$(OBJS)\stclib_LexBullant.o \
-	$(OBJS)\stclib_LexCPP.o \
-	$(OBJS)\stclib_LexCSS.o \
+	$(OBJS)\stclib_LexCLW.o \
 	$(OBJS)\stclib_LexConf.o \
+	$(OBJS)\stclib_LexCPP.o \
 	$(OBJS)\stclib_LexCrontab.o \
+	$(OBJS)\stclib_LexCSS.o \
 	$(OBJS)\stclib_LexEiffel.o \
+	$(OBJS)\stclib_LexErlang.o \
 	$(OBJS)\stclib_LexEScript.o \
+	$(OBJS)\stclib_LexForth.o \
 	$(OBJS)\stclib_LexFortran.o \
 	$(OBJS)\stclib_LexHTML.o \
 	$(OBJS)\stclib_LexLisp.o \
 	$(OBJS)\stclib_LexLout.o \
 	$(OBJS)\stclib_LexLua.o \
 	$(OBJS)\stclib_LexMatlab.o \
+	$(OBJS)\stclib_LexMetapost.o \
+	$(OBJS)\stclib_LexMMIXAL.o \
+	$(OBJS)\stclib_LexMPT.o \
+	$(OBJS)\stclib_LexNsis.o \
 	$(OBJS)\stclib_LexOthers.o \
-	$(OBJS)\stclib_LexPOV.o \
 	$(OBJS)\stclib_LexPascal.o \
+	$(OBJS)\stclib_LexPB.o \
 	$(OBJS)\stclib_LexPerl.o \
+	$(OBJS)\stclib_LexPOV.o \
+	$(OBJS)\stclib_LexPS.o \
 	$(OBJS)\stclib_LexPython.o \
 	$(OBJS)\stclib_LexRuby.o \
+	$(OBJS)\stclib_LexScriptol.o \
 	$(OBJS)\stclib_LexSQL.o \
+	$(OBJS)\stclib_LexTeX.o \
 	$(OBJS)\stclib_LexVB.o \
+	$(OBJS)\stclib_LexYAML.o \
 	$(OBJS)\stclib_LineMarker.o \
 	$(OBJS)\stclib_PropSet.o \
 	$(OBJS)\stclib_RESearch.o \
 	$(OBJS)\stclib_ScintillaBase.o \
-	$(OBJS)\stclib_Style.o \
 	$(OBJS)\stclib_StyleContext.o \
+	$(OBJS)\stclib_Style.o \
 	$(OBJS)\stclib_UniConversion.o \
 	$(OBJS)\stclib_ViewStyle.o \
 	$(OBJS)\stclib_WindowAccessor.o \
@@ -133,12 +159,6 @@ STCLIB_OBJECTS =  \
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_dll$(CFG)
-endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -159,15 +179,46 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 WXDEBUGFLAG = d
 endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
 endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),1)
+__stcdll___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(SHARED),0)
+__stclib___depname = \
+	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
+endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g
@@ -185,55 +236,42 @@ ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
-endif
-ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
-endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-rtti
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_0 = -fno-exceptions
 endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_0 = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
-ifeq ($(SHARED),1)
-__stcdll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(SHARED),0)
-__stclib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
+LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\stc\..\..\..\lib\gcc_dll$(CFG)
 endif
 
 
@@ -245,6 +283,33 @@ $(OBJS):
 
 all: $(__stcdll___depname) $(__stclib___depname)
 
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
+
+ifeq ($(SHARED),1)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
+	$(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__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)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a: $(STCLIB_OBJECTS)
+	if exist $@ del $@
+	ar rcu $@ $(STCLIB_OBJECTS)
+	ranlib $@
+endif
+
+$(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
@@ -257,10 +322,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_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_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_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
@@ -278,37 +343,46 @@ $(OBJS)\stcdll_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx
 $(OBJS)\stcdll_KeyWords.o: ../../src/stc/scintilla/src/KeyWords.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
 $(OBJS)\stcdll_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexBullant.o: ../../src/stc/scintilla/src/LexBullant.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexCLW.o: ../../src/stc/scintilla/src/LexCLW.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexCPP.o: ../../src/stc/scintilla/src/LexCPP.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexCSS.o: ../../src/stc/scintilla/src/LexCSS.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx
+$(OBJS)\stcdll_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx
+$(OBJS)\stcdll_LexErlang.o: ../../src/stc/scintilla/src/LexErlang.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexEScript.o: ../../src/stc/scintilla/src/LexEScript.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx
+$(OBJS)\stcdll_LexForth.o: ../../src/stc/scintilla/src/LexForth.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexFortran.o: ../../src/stc/scintilla/src/LexFortran.cxx
@@ -329,34 +403,58 @@ $(OBJS)\stcdll_LexLua.o: ../../src/stc/scintilla/src/LexLua.cxx
 $(OBJS)\stcdll_LexMatlab.o: ../../src/stc/scintilla/src/LexMatlab.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
+$(OBJS)\stcdll_LexMetapost.o: ../../src/stc/scintilla/src/LexMetapost.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
+$(OBJS)\stcdll_LexMMIXAL.o: ../../src/stc/scintilla/src/LexMMIXAL.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_LexMPT.o: ../../src/stc/scintilla/src/LexMPT.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_LexNsis.o: ../../src/stc/scintilla/src/LexNsis.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexPascal.o: ../../src/stc/scintilla/src/LexPascal.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexPB.o: ../../src/stc/scintilla/src/LexPB.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexPerl.o: ../../src/stc/scintilla/src/LexPerl.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_LexPS.o: ../../src/stc/scintilla/src/LexPS.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexPython.o: ../../src/stc/scintilla/src/LexPython.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_LexRuby.o: ../../src/stc/scintilla/src/LexRuby.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexScriptol.o: ../../src/stc/scintilla/src/LexScriptol.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexSQL.o: ../../src/stc/scintilla/src/LexSQL.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+$(OBJS)\stcdll_LexTeX.o: ../../src/stc/scintilla/src/LexTeX.cxx
+	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexVB.o: ../../src/stc/scintilla/src/LexVB.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx
+$(OBJS)\stcdll_LexYAML.o: ../../src/stc/scintilla/src/LexYAML.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp
+$(OBJS)\stcdll_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_PropSet.o: ../../src/stc/scintilla/src/PropSet.cxx
@@ -368,15 +466,12 @@ $(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_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
+$(OBJS)\stcdll_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_Style.o: ../../src/stc/scintilla/src/Style.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(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
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
@@ -389,8 +484,14 @@ $(OBJS)\stcdll_WindowAccessor.o: ../../src/stc/scintilla/src/WindowAccessor.cxx
 $(OBJS)\stcdll_XPM.o: ../../src/stc/scintilla/src/XPM.cxx
 	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+$(OBJS)\stclib_PlatWX.o: ../../src/stc/PlatWX.cpp
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_stc.o: ../../src/stc/stc.cpp
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
@@ -404,10 +505,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_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_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_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
@@ -425,37 +526,46 @@ $(OBJS)\stclib_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx
 $(OBJS)\stclib_KeyWords.o: ../../src/stc/scintilla/src/KeyWords.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
 $(OBJS)\stclib_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexBullant.o: ../../src/stc/scintilla/src/LexBullant.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexCLW.o: ../../src/stc/scintilla/src/LexCLW.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexCPP.o: ../../src/stc/scintilla/src/LexCPP.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexCSS.o: ../../src/stc/scintilla/src/LexCSS.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx
+$(OBJS)\stclib_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx
+$(OBJS)\stclib_LexErlang.o: ../../src/stc/scintilla/src/LexErlang.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexEScript.o: ../../src/stc/scintilla/src/LexEScript.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx
+$(OBJS)\stclib_LexForth.o: ../../src/stc/scintilla/src/LexForth.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexFortran.o: ../../src/stc/scintilla/src/LexFortran.cxx
@@ -476,34 +586,58 @@ $(OBJS)\stclib_LexLua.o: ../../src/stc/scintilla/src/LexLua.cxx
 $(OBJS)\stclib_LexMatlab.o: ../../src/stc/scintilla/src/LexMatlab.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
+$(OBJS)\stclib_LexMetapost.o: ../../src/stc/scintilla/src/LexMetapost.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
+$(OBJS)\stclib_LexMMIXAL.o: ../../src/stc/scintilla/src/LexMMIXAL.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_LexMPT.o: ../../src/stc/scintilla/src/LexMPT.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_LexNsis.o: ../../src/stc/scintilla/src/LexNsis.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexPascal.o: ../../src/stc/scintilla/src/LexPascal.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexPB.o: ../../src/stc/scintilla/src/LexPB.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexPerl.o: ../../src/stc/scintilla/src/LexPerl.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_LexPS.o: ../../src/stc/scintilla/src/LexPS.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexPython.o: ../../src/stc/scintilla/src/LexPython.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_LexRuby.o: ../../src/stc/scintilla/src/LexRuby.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexScriptol.o: ../../src/stc/scintilla/src/LexScriptol.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexSQL.o: ../../src/stc/scintilla/src/LexSQL.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+$(OBJS)\stclib_LexTeX.o: ../../src/stc/scintilla/src/LexTeX.cxx
+	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexVB.o: ../../src/stc/scintilla/src/LexVB.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx
+$(OBJS)\stclib_LexYAML.o: ../../src/stc/scintilla/src/LexYAML.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_PlatWX.o: ../../src/stc/PlatWX.cpp
+$(OBJS)\stclib_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_PropSet.o: ../../src/stc/scintilla/src/PropSet.cxx
@@ -515,15 +649,12 @@ $(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_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
+$(OBJS)\stclib_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 $(OBJS)\stclib_Style.o: ../../src/stc/scintilla/src/Style.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(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
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
@@ -536,25 +667,4 @@ $(OBJS)\stclib_WindowAccessor.o: ../../src/stc/scintilla/src/WindowAccessor.cxx
 $(OBJS)\stclib_XPM.o: ../../src/stc/scintilla/src/XPM.cxx
 	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_stc.o: ../../src/stc/stc.cpp
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
-	$(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a: $(STCLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(STCLIB_OBJECTS)
-	ranlib $@
-endif
-
 .PHONY: all clean