added conversions to/from UTF 16/32 LE/BE (patch 809685)

[wxWidgets.git] / contrib / build / stc / makefile.gcc

diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index a3881420b6930234cc1328bf1160430799259afe..4010bfe3c2ee4d216f4b8803acbe0daf8460a78f 100644 (file)
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -12,16 +12,13 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-       ..\..\src\stc\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 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$(LIBDIRNAME) \
-       -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \
-       -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \
-       -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \
+       $(__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)
@@ -56,14 +53,18 @@ STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_LexLisp.o \
        $(OBJS)\stcdll_LexLout.o \
        $(OBJS)\stcdll_LexLua.o \
+       $(OBJS)\stcdll_LexMMIXAL.o \
        $(OBJS)\stcdll_LexMatlab.o \
+       $(OBJS)\stcdll_LexNsis.o \
        $(OBJS)\stcdll_LexOthers.o \
        $(OBJS)\stcdll_LexPOV.o \
+       $(OBJS)\stcdll_LexPS.o \
        $(OBJS)\stcdll_LexPascal.o \
        $(OBJS)\stcdll_LexPerl.o \
        $(OBJS)\stcdll_LexPython.o \
        $(OBJS)\stcdll_LexRuby.o \
        $(OBJS)\stcdll_LexSQL.o \
+       $(OBJS)\stcdll_LexScriptol.o \
        $(OBJS)\stcdll_LexVB.o \
        $(OBJS)\stcdll_LineMarker.o \
        $(OBJS)\stcdll_PropSet.o \
@@ -77,10 +78,7 @@ STCDLL_OBJECTS =  \
        $(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$(LIBDIRNAME) \
-       -I..\..\src\stc\..\..\..\src\tiff -I..\..\src\stc\..\..\..\src\jpeg \
-       -I..\..\src\stc\..\..\..\src\png -I..\..\src\stc\..\..\..\src\zlib \
-       -I..\..\src\stc\..\..\..\src\regex -I..\..\src\stc\..\..\..\src\expat\lib \
+       $(__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)
 STCLIB_OBJECTS =  \
@@ -114,14 +112,18 @@ STCLIB_OBJECTS =  \
        $(OBJS)\stclib_LexLisp.o \
        $(OBJS)\stclib_LexLout.o \
        $(OBJS)\stclib_LexLua.o \
+       $(OBJS)\stclib_LexMMIXAL.o \
        $(OBJS)\stclib_LexMatlab.o \
+       $(OBJS)\stclib_LexNsis.o \
        $(OBJS)\stclib_LexOthers.o \
        $(OBJS)\stclib_LexPOV.o \
+       $(OBJS)\stclib_LexPS.o \
        $(OBJS)\stclib_LexPascal.o \
        $(OBJS)\stclib_LexPerl.o \
        $(OBJS)\stclib_LexPython.o \
        $(OBJS)\stclib_LexRuby.o \
        $(OBJS)\stclib_LexSQL.o \
+       $(OBJS)\stclib_LexScriptol.o \
        $(OBJS)\stclib_LexVB.o \
        $(OBJS)\stclib_LineMarker.o \
        $(OBJS)\stclib_PropSet.o \
@@ -139,6 +141,12 @@ 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
@@ -208,7 +216,7 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
@@ -229,7 +237,7 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(SHARED),1)
 __stcdll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll
 endif
 ifeq ($(SHARED),0)
 __stclib___depname = \
@@ -245,309 +253,333 @@ $(OBJS):
 
 all: $(__stcdll___depname) $(__stclib___depname)
 
-$(OBJS)\stcdll_AutoComplete.o: ../../src/stc\scintilla\src\AutoComplete.cxx
+$(OBJS)\stcdll_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx
+       $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_CallTip.o: ../../src/stc/scintilla/src/CallTip.cxx
+       $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx
+       $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stcdll_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_CallTip.o: ../../src/stc\scintilla\src\CallTip.cxx
+$(OBJS)\stcdll_Document.o: ../../src/stc/scintilla/src/Document.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_CellBuffer.o: ../../src/stc\scintilla\src\CellBuffer.cxx
+$(OBJS)\stcdll_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_ContractionState.o: ../../src/stc\scintilla\src\ContractionState.cxx
+$(OBJS)\stcdll_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_Document.o: ../../src/stc\scintilla\src\Document.cxx
+$(OBJS)\stcdll_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_DocumentAccessor.o: ../../src/stc\scintilla\src\DocumentAccessor.cxx
+$(OBJS)\stcdll_Indicator.o: ../../src/stc/scintilla/src/Indicator.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_Editor.o: ../../src/stc\scintilla\src\Editor.cxx
+$(OBJS)\stcdll_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_ExternalLexer.o: ../../src/stc\scintilla\src\ExternalLexer.cxx
+$(OBJS)\stcdll_KeyWords.o: ../../src/stc/scintilla/src/KeyWords.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_Indicator.o: ../../src/stc\scintilla\src\Indicator.cxx
+$(OBJS)\stcdll_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_KeyMap.o: ../../src/stc\scintilla\src\KeyMap.cxx
+$(OBJS)\stcdll_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_KeyWords.o: ../../src/stc\scintilla\src\KeyWords.cxx
+$(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
+$(OBJS)\stcdll_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexAda.o: ../../src/stc\scintilla\src\LexAda.cxx
+$(OBJS)\stcdll_LexBullant.o: ../../src/stc/scintilla/src/LexBullant.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexAsm.o: ../../src/stc\scintilla\src\LexAsm.cxx
+$(OBJS)\stcdll_LexCPP.o: ../../src/stc/scintilla/src/LexCPP.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexBaan.o: ../../src/stc\scintilla\src\LexBaan.cxx
+$(OBJS)\stcdll_LexCSS.o: ../../src/stc/scintilla/src/LexCSS.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexBullant.o: ../../src/stc\scintilla\src\LexBullant.cxx
+$(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
+$(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
+$(OBJS)\stcdll_LexEScript.o: ../../src/stc/scintilla/src/LexEScript.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_LexFortran.o: ../../src/stc/scintilla/src/LexFortran.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexEScript.o: ../../src/stc\scintilla\src\LexEScript.cxx
+$(OBJS)\stcdll_LexHTML.o: ../../src/stc/scintilla/src/LexHTML.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexEiffel.o: ../../src/stc\scintilla\src\LexEiffel.cxx
+$(OBJS)\stcdll_LexLisp.o: ../../src/stc/scintilla/src/LexLisp.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexFortran.o: ../../src/stc\scintilla\src\LexFortran.cxx
+$(OBJS)\stcdll_LexLout.o: ../../src/stc/scintilla/src/LexLout.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexHTML.o: ../../src/stc\scintilla\src\LexHTML.cxx
+$(OBJS)\stcdll_LexLua.o: ../../src/stc/scintilla/src/LexLua.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexLisp.o: ../../src/stc\scintilla\src\LexLisp.cxx
+$(OBJS)\stcdll_LexMMIXAL.o: ../../src/stc/scintilla/src/LexMMIXAL.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexLout.o: ../../src/stc\scintilla\src\LexLout.cxx
+$(OBJS)\stcdll_LexMatlab.o: ../../src/stc/scintilla/src/LexMatlab.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexLua.o: ../../src/stc\scintilla\src\LexLua.cxx
+$(OBJS)\stcdll_LexNsis.o: ../../src/stc/scintilla/src/LexNsis.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexMatlab.o: ../../src/stc\scintilla\src\LexMatlab.cxx
+$(OBJS)\stcdll_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexOthers.o: ../../src/stc\scintilla\src\LexOthers.cxx
+$(OBJS)\stcdll_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexPOV.o: ../../src/stc\scintilla\src\LexPOV.cxx
+$(OBJS)\stcdll_LexPS.o: ../../src/stc/scintilla/src/LexPS.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexPascal.o: ../../src/stc\scintilla\src\LexPascal.cxx
+$(OBJS)\stcdll_LexPascal.o: ../../src/stc/scintilla/src/LexPascal.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexPerl.o: ../../src/stc\scintilla\src\LexPerl.cxx
+$(OBJS)\stcdll_LexPerl.o: ../../src/stc/scintilla/src/LexPerl.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexPython.o: ../../src/stc\scintilla\src\LexPython.cxx
+$(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
+$(OBJS)\stcdll_LexRuby.o: ../../src/stc/scintilla/src/LexRuby.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexSQL.o: ../../src/stc\scintilla\src\LexSQL.cxx
+$(OBJS)\stcdll_LexSQL.o: ../../src/stc/scintilla/src/LexSQL.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LexVB.o: ../../src/stc\scintilla\src\LexVB.cxx
+$(OBJS)\stcdll_LexScriptol.o: ../../src/stc/scintilla/src/LexScriptol.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_LineMarker.o: ../../src/stc\scintilla\src\LineMarker.cxx
+$(OBJS)\stcdll_LexVB.o: ../../src/stc/scintilla/src/LexVB.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
+$(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_RESearch.o: ../../src/stc\scintilla\src\RESearch.cxx
+$(OBJS)\stcdll_PropSet.o: ../../src/stc/scintilla/src/PropSet.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_ScintillaBase.o: ../../src/stc\scintilla\src\ScintillaBase.cxx
+$(OBJS)\stcdll_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc\ScintillaWX.cpp
+$(OBJS)\stcdll_ScintillaBase.o: ../../src/stc/scintilla/src/ScintillaBase.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_Style.o: ../../src/stc\scintilla\src\Style.cxx
+$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
        $(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_UniConversion.o: ../../src/stc\scintilla\src\UniConversion.cxx
+$(OBJS)\stcdll_StyleContext.o: ../../src/stc/scintilla/src/StyleContext.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_ViewStyle.o: ../../src/stc\scintilla\src\ViewStyle.cxx
+$(OBJS)\stcdll_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_WindowAccessor.o: ../../src/stc\scintilla\src\WindowAccessor.cxx
+$(OBJS)\stcdll_ViewStyle.o: ../../src/stc/scintilla/src/ViewStyle.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_XPM.o: ../../src/stc\scintilla\src\XPM.cxx
+$(OBJS)\stcdll_WindowAccessor.o: ../../src/stc/scintilla/src/WindowAccessor.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stcdll_stc.o: ../../src/stc\stc.cpp
+$(OBJS)\stcdll_XPM.o: ../../src/stc/scintilla/src/XPM.cxx
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-$(OBJS)\stclib_AutoComplete.o: ../../src/stc\scintilla\src\AutoComplete.cxx
+$(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp
+       $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+$(OBJS)\stclib_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx
+       $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_CallTip.o: ../../src/stc/scintilla/src/CallTip.cxx
+       $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(OBJS)\stclib_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx
+       $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+$(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
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_CallTip.o: ../../src/stc\scintilla\src\CallTip.cxx
+$(OBJS)\stclib_DocumentAccessor.o: ../../src/stc/scintilla/src/DocumentAccessor.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_CellBuffer.o: ../../src/stc\scintilla\src\CellBuffer.cxx
+$(OBJS)\stclib_Editor.o: ../../src/stc/scintilla/src/Editor.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_ContractionState.o: ../../src/stc\scintilla\src\ContractionState.cxx
+$(OBJS)\stclib_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_Document.o: ../../src/stc\scintilla\src\Document.cxx
+$(OBJS)\stclib_Indicator.o: ../../src/stc/scintilla/src/Indicator.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_DocumentAccessor.o: ../../src/stc\scintilla\src\DocumentAccessor.cxx
+$(OBJS)\stclib_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_Editor.o: ../../src/stc\scintilla\src\Editor.cxx
+$(OBJS)\stclib_KeyWords.o: ../../src/stc/scintilla/src/KeyWords.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_ExternalLexer.o: ../../src/stc\scintilla\src\ExternalLexer.cxx
+$(OBJS)\stclib_LexAVE.o: ../../src/stc/scintilla/src/LexAVE.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_Indicator.o: ../../src/stc\scintilla\src\Indicator.cxx
+$(OBJS)\stclib_LexAda.o: ../../src/stc/scintilla/src/LexAda.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_KeyMap.o: ../../src/stc\scintilla\src\KeyMap.cxx
+$(OBJS)\stclib_LexAsm.o: ../../src/stc/scintilla/src/LexAsm.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_KeyWords.o: ../../src/stc\scintilla\src\KeyWords.cxx
+$(OBJS)\stclib_LexBaan.o: ../../src/stc/scintilla/src/LexBaan.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexAVE.o: ../../src/stc\scintilla\src\LexAVE.cxx
+$(OBJS)\stclib_LexBullant.o: ../../src/stc/scintilla/src/LexBullant.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexAda.o: ../../src/stc\scintilla\src\LexAda.cxx
+$(OBJS)\stclib_LexCPP.o: ../../src/stc/scintilla/src/LexCPP.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexAsm.o: ../../src/stc\scintilla\src\LexAsm.cxx
+$(OBJS)\stclib_LexCSS.o: ../../src/stc/scintilla/src/LexCSS.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexBaan.o: ../../src/stc\scintilla\src\LexBaan.cxx
+$(OBJS)\stclib_LexConf.o: ../../src/stc/scintilla/src/LexConf.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexBullant.o: ../../src/stc\scintilla\src\LexBullant.cxx
+$(OBJS)\stclib_LexCrontab.o: ../../src/stc/scintilla/src/LexCrontab.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexCPP.o: ../../src/stc\scintilla\src\LexCPP.cxx
+$(OBJS)\stclib_LexEScript.o: ../../src/stc/scintilla/src/LexEScript.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexCSS.o: ../../src/stc\scintilla\src\LexCSS.cxx
+$(OBJS)\stclib_LexEiffel.o: ../../src/stc/scintilla/src/LexEiffel.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexConf.o: ../../src/stc\scintilla\src\LexConf.cxx
+$(OBJS)\stclib_LexFortran.o: ../../src/stc/scintilla/src/LexFortran.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexCrontab.o: ../../src/stc\scintilla\src\LexCrontab.cxx
+$(OBJS)\stclib_LexHTML.o: ../../src/stc/scintilla/src/LexHTML.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexEScript.o: ../../src/stc\scintilla\src\LexEScript.cxx
+$(OBJS)\stclib_LexLisp.o: ../../src/stc/scintilla/src/LexLisp.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexEiffel.o: ../../src/stc\scintilla\src\LexEiffel.cxx
+$(OBJS)\stclib_LexLout.o: ../../src/stc/scintilla/src/LexLout.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexFortran.o: ../../src/stc\scintilla\src\LexFortran.cxx
+$(OBJS)\stclib_LexLua.o: ../../src/stc/scintilla/src/LexLua.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexHTML.o: ../../src/stc\scintilla\src\LexHTML.cxx
+$(OBJS)\stclib_LexMMIXAL.o: ../../src/stc/scintilla/src/LexMMIXAL.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexLisp.o: ../../src/stc\scintilla\src\LexLisp.cxx
+$(OBJS)\stclib_LexMatlab.o: ../../src/stc/scintilla/src/LexMatlab.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexLout.o: ../../src/stc\scintilla\src\LexLout.cxx
+$(OBJS)\stclib_LexNsis.o: ../../src/stc/scintilla/src/LexNsis.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexLua.o: ../../src/stc\scintilla\src\LexLua.cxx
+$(OBJS)\stclib_LexOthers.o: ../../src/stc/scintilla/src/LexOthers.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexMatlab.o: ../../src/stc\scintilla\src\LexMatlab.cxx
+$(OBJS)\stclib_LexPOV.o: ../../src/stc/scintilla/src/LexPOV.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexOthers.o: ../../src/stc\scintilla\src\LexOthers.cxx
+$(OBJS)\stclib_LexPS.o: ../../src/stc/scintilla/src/LexPS.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexPOV.o: ../../src/stc\scintilla\src\LexPOV.cxx
+$(OBJS)\stclib_LexPascal.o: ../../src/stc/scintilla/src/LexPascal.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexPascal.o: ../../src/stc\scintilla\src\LexPascal.cxx
+$(OBJS)\stclib_LexPerl.o: ../../src/stc/scintilla/src/LexPerl.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexPerl.o: ../../src/stc\scintilla\src\LexPerl.cxx
+$(OBJS)\stclib_LexPython.o: ../../src/stc/scintilla/src/LexPython.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexPython.o: ../../src/stc\scintilla\src\LexPython.cxx
+$(OBJS)\stclib_LexRuby.o: ../../src/stc/scintilla/src/LexRuby.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexRuby.o: ../../src/stc\scintilla\src\LexRuby.cxx
+$(OBJS)\stclib_LexSQL.o: ../../src/stc/scintilla/src/LexSQL.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexSQL.o: ../../src/stc\scintilla\src\LexSQL.cxx
+$(OBJS)\stclib_LexScriptol.o: ../../src/stc/scintilla/src/LexScriptol.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_LexVB.o: ../../src/stc\scintilla\src\LexVB.cxx
+$(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_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_PlatWX.o: ../../src/stc\PlatWX.cpp
+$(OBJS)\stclib_PlatWX.o: ../../src/stc/PlatWX.cpp
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_PropSet.o: ../../src/stc\scintilla\src\PropSet.cxx
+$(OBJS)\stclib_PropSet.o: ../../src/stc/scintilla/src/PropSet.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_RESearch.o: ../../src/stc\scintilla\src\RESearch.cxx
+$(OBJS)\stclib_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_ScintillaBase.o: ../../src/stc\scintilla\src\ScintillaBase.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_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_Style.o: ../../src/stc\scintilla\src\Style.cxx
+$(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
+$(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
+$(OBJS)\stclib_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_ViewStyle.o: ../../src/stc\scintilla\src\ViewStyle.cxx
+$(OBJS)\stclib_ViewStyle.o: ../../src/stc/scintilla/src/ViewStyle.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_WindowAccessor.o: ../../src/stc\scintilla\src\WindowAccessor.cxx
+$(OBJS)\stclib_WindowAccessor.o: ../../src/stc/scintilla/src/WindowAccessor.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_XPM.o: ../../src/stc\scintilla\src\XPM.cxx
+$(OBJS)\stclib_XPM.o: ../../src/stc/scintilla/src/XPM.cxx
        $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-$(OBJS)\stclib_stc.o: ../../src/stc\stc.cpp
+$(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)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(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)