diff --git a/Makefile b/Makefile
index f8a6f366d..d9c8ff9fe 100644
--- a/Makefile
+++ b/Makefile
@@ -45396,6 +45396,180 @@ $(OutDir_plugin_md)md.a: \
 $(OutDir_ide_clang):
 	mkdir -p $(OutDir_ide_clang)
 
+$(OutDir_ide_clang)libclang.o: $(UPPDIR1)ide/clang/libclang.cpp \
+	$(UPPDIR1)CodeEditor/CodeEditor.h \
+	$(UPPDIR1)CodeEditor/CSyntax.h \
+	$(UPPDIR1)CodeEditor/DiffSyntax.h \
+	$(UPPDIR1)CodeEditor/hl_color.i \
+	$(UPPDIR1)CodeEditor/LogSyntax.h \
+	$(UPPDIR1)CodeEditor/PythonSyntax.h \
+	$(UPPDIR1)CodeEditor/Syntax.h \
+	$(UPPDIR1)CodeEditor/TagSyntax.h \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/AString.hpp \
+	$(UPPDIR1)Core/Atomic.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/CallbackN.i \
+	$(UPPDIR1)Core/CallbackNP.i \
+	$(UPPDIR1)Core/CallbackR.i \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/CharSet.i \
+	$(UPPDIR1)Core/CoAlgo.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Complex.h \
+	$(UPPDIR1)Core/config.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Convert.hpp \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/CoSort.h \
+	$(UPPDIR1)Core/CoWork.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/dli.h \
+	$(UPPDIR1)Core/FilterStream.h \
+	$(UPPDIR1)Core/FixedMap.h \
+	$(UPPDIR1)Core/Fn.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Function.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/Hash.h \
+	$(UPPDIR1)Core/Heap.h \
+	$(UPPDIR1)Core/Huge.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Inet.h \
+	$(UPPDIR1)Core/InMap.hpp \
+	$(UPPDIR1)Core/InVector.h \
+	$(UPPDIR1)Core/InVector.hpp \
+	$(UPPDIR1)Core/JSON.h \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/lib/lz4.h \
+	$(UPPDIR1)Core/LocalProcess.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Map.hpp \
+	$(UPPDIR1)Core/Mem.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/mt_.h \
+	$(UPPDIR1)Core/Obsolete.h \
+	$(UPPDIR1)Core/Ops.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Other.hpp \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Range.h \
+	$(UPPDIR1)Core/SIMD_NEON.h \
+	$(UPPDIR1)Core/SIMD_SSE2.h \
+	$(UPPDIR1)Core/Sort.h \
+	$(UPPDIR1)Core/Sorted.h \
+	$(UPPDIR1)Core/SplitMerge.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Tuple.h \
+	$(UPPDIR1)Core/Utf.hpp \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Value.hpp \
+	$(UPPDIR1)Core/ValueCache.h \
+	$(UPPDIR1)Core/ValueUtil.h \
+	$(UPPDIR1)Core/ValueUtil.hpp \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Util.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/Xmlize.hpp \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)CtrlCore/CtrlCore.h \
+	$(UPPDIR1)CtrlCore/lay.h \
+	$(UPPDIR1)CtrlCore/lay0.h \
+	$(UPPDIR1)CtrlCore/MKeys.h \
+	$(UPPDIR1)CtrlCore/TopWindow.h \
+	$(UPPDIR1)CtrlLib/AKeys.h \
+	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
+	$(UPPDIR1)CtrlLib/Bar.h \
+	$(UPPDIR1)CtrlLib/Ch.h \
+	$(UPPDIR1)CtrlLib/ColumnList.h \
+	$(UPPDIR1)CtrlLib/CtrlLib.h \
+	$(UPPDIR1)CtrlLib/CtrlUtil.h \
+	$(UPPDIR1)CtrlLib/DateTimeCtrl.h \
+	$(UPPDIR1)CtrlLib/DisplayPopup.h \
+	$(UPPDIR1)CtrlLib/DlgColor.h \
+	$(UPPDIR1)CtrlLib/DropChoice.h \
+	$(UPPDIR1)CtrlLib/EditCtrl.h \
+	$(UPPDIR1)CtrlLib/EditCtrl.hpp \
+	$(UPPDIR1)CtrlLib/FileSel.h \
+	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
+	$(UPPDIR1)CtrlLib/LabelBase.h \
+	$(UPPDIR1)CtrlLib/Lang.h \
+	$(UPPDIR1)CtrlLib/MultiButton.h \
+	$(UPPDIR1)CtrlLib/Progress.h \
+	$(UPPDIR1)CtrlLib/PushCtrl.h \
+	$(UPPDIR1)CtrlLib/RichText.h \
+	$(UPPDIR1)CtrlLib/ScrollBar.h \
+	$(UPPDIR1)CtrlLib/SliderCtrl.h \
+	$(UPPDIR1)CtrlLib/Splitter.h \
+	$(UPPDIR1)CtrlLib/StaticCtrl.h \
+	$(UPPDIR1)CtrlLib/StatusBar.h \
+	$(UPPDIR1)CtrlLib/SuggestCtrl.h \
+	$(UPPDIR1)CtrlLib/TabCtrl.h \
+	$(UPPDIR1)CtrlLib/TextEdit.h \
+	$(UPPDIR1)CtrlLib/TreeCtrl.h \
+	$(UPPDIR1)Draw/Cham.h \
+	$(UPPDIR1)Draw/DDARasterizer.h \
+	$(UPPDIR1)Draw/Display.h \
+	$(UPPDIR1)Draw/Draw.h \
+	$(UPPDIR1)Draw/FontInt.h \
+	$(UPPDIR1)Draw/Image.h \
+	$(UPPDIR1)Draw/ImageOp.h \
+	$(UPPDIR1)Draw/iml_header.h \
+	$(UPPDIR1)Draw/Raster.h \
+	$(UPPDIR1)Draw/SDraw.h \
+	$(UPPDIR1)Draw/SIMD.h \
+	$(UPPDIR1)Esc/Esc.h \
+	$(UPPDIR1)guiplatform.h \
+	$(UPPDIR1)ide/clang/clang.h \
+	$(UPPDIR1)ide/clang/libclang.h \
+	$(UPPDIR1)ide/Common/Common.h \
+	$(UPPDIR1)ide/Core/Core.h \
+	$(UPPDIR1)ide/Core/Host.h \
+	$(UPPDIR1)ide/Core/Logger.h \
+	$(UPPDIR1)Painter/BufferPainter.h \
+	$(UPPDIR1)Painter/Interpolator.hpp \
+	$(UPPDIR1)Painter/LinearPath.h \
+	$(UPPDIR1)Painter/Painter.h \
+	$(UPPDIR1)Painter/Painter.hpp \
+	$(UPPDIR1)Painter/Painting.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/lz4/lz4.h \
+	$(UPPDIR1)plugin/lzma/lzma.h \
+	$(UPPDIR1)plugin/pcre/lib/pcre.h \
+	$(UPPDIR1)plugin/pcre/Pcre.h \
+	$(UPPDIR1)plugin/pcre/RegExp.h \
+	$(UPPDIR1)plugin/png/png.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/zstd/lib/zstd.h \
+	$(UPPDIR1)plugin/zstd/zstd.h \
+	$(UPPDIR1)RichText/Para.h \
+	$(UPPDIR1)RichText/RichText.h \
+	$(UPPDIR1)RichText/Table.h \
+	$(UPPDIR1)RichText/Text.h \
+	$(UPPDIR1)RichText/Txt.h \
+	$(UPPDIR1)uppconfig.h
+	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/libclang.cpp -o $(OutDir_ide_clang)libclang.o
+
 $(OutDir_ide_clang)util.o: $(UPPDIR1)ide/clang/util.cpp \
 	$(UPPDIR1)CodeEditor/CodeEditor.h \
 	$(UPPDIR1)CodeEditor/CSyntax.h \
@@ -45915,180 +46089,6 @@ $(OutDir_ide_clang)Signature.o: $(UPPDIR1)ide/clang/Signature.cpp \
 	$(UPPDIR1)uppconfig.h
 	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/Signature.cpp -o $(OutDir_ide_clang)Signature.o
 
-$(OutDir_ide_clang)libclang.o: $(UPPDIR1)ide/clang/libclang.cpp \
-	$(UPPDIR1)CodeEditor/CodeEditor.h \
-	$(UPPDIR1)CodeEditor/CSyntax.h \
-	$(UPPDIR1)CodeEditor/DiffSyntax.h \
-	$(UPPDIR1)CodeEditor/hl_color.i \
-	$(UPPDIR1)CodeEditor/LogSyntax.h \
-	$(UPPDIR1)CodeEditor/PythonSyntax.h \
-	$(UPPDIR1)CodeEditor/Syntax.h \
-	$(UPPDIR1)CodeEditor/TagSyntax.h \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/AString.hpp \
-	$(UPPDIR1)Core/Atomic.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/CallbackN.i \
-	$(UPPDIR1)Core/CallbackNP.i \
-	$(UPPDIR1)Core/CallbackR.i \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/CharSet.i \
-	$(UPPDIR1)Core/CoAlgo.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Complex.h \
-	$(UPPDIR1)Core/config.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Convert.hpp \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/CoSort.h \
-	$(UPPDIR1)Core/CoWork.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/dli.h \
-	$(UPPDIR1)Core/FilterStream.h \
-	$(UPPDIR1)Core/FixedMap.h \
-	$(UPPDIR1)Core/Fn.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Function.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/Hash.h \
-	$(UPPDIR1)Core/Heap.h \
-	$(UPPDIR1)Core/Huge.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Inet.h \
-	$(UPPDIR1)Core/InMap.hpp \
-	$(UPPDIR1)Core/InVector.h \
-	$(UPPDIR1)Core/InVector.hpp \
-	$(UPPDIR1)Core/JSON.h \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/lib/lz4.h \
-	$(UPPDIR1)Core/LocalProcess.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Map.hpp \
-	$(UPPDIR1)Core/Mem.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/mt_.h \
-	$(UPPDIR1)Core/Obsolete.h \
-	$(UPPDIR1)Core/Ops.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Other.hpp \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Range.h \
-	$(UPPDIR1)Core/SIMD_NEON.h \
-	$(UPPDIR1)Core/SIMD_SSE2.h \
-	$(UPPDIR1)Core/Sort.h \
-	$(UPPDIR1)Core/Sorted.h \
-	$(UPPDIR1)Core/SplitMerge.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Tuple.h \
-	$(UPPDIR1)Core/Utf.hpp \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Value.hpp \
-	$(UPPDIR1)Core/ValueCache.h \
-	$(UPPDIR1)Core/ValueUtil.h \
-	$(UPPDIR1)Core/ValueUtil.hpp \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Util.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/Xmlize.hpp \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)CtrlCore/CtrlCore.h \
-	$(UPPDIR1)CtrlCore/lay.h \
-	$(UPPDIR1)CtrlCore/lay0.h \
-	$(UPPDIR1)CtrlCore/MKeys.h \
-	$(UPPDIR1)CtrlCore/TopWindow.h \
-	$(UPPDIR1)CtrlLib/AKeys.h \
-	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
-	$(UPPDIR1)CtrlLib/Bar.h \
-	$(UPPDIR1)CtrlLib/Ch.h \
-	$(UPPDIR1)CtrlLib/ColumnList.h \
-	$(UPPDIR1)CtrlLib/CtrlLib.h \
-	$(UPPDIR1)CtrlLib/CtrlUtil.h \
-	$(UPPDIR1)CtrlLib/DateTimeCtrl.h \
-	$(UPPDIR1)CtrlLib/DisplayPopup.h \
-	$(UPPDIR1)CtrlLib/DlgColor.h \
-	$(UPPDIR1)CtrlLib/DropChoice.h \
-	$(UPPDIR1)CtrlLib/EditCtrl.h \
-	$(UPPDIR1)CtrlLib/EditCtrl.hpp \
-	$(UPPDIR1)CtrlLib/FileSel.h \
-	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
-	$(UPPDIR1)CtrlLib/LabelBase.h \
-	$(UPPDIR1)CtrlLib/Lang.h \
-	$(UPPDIR1)CtrlLib/MultiButton.h \
-	$(UPPDIR1)CtrlLib/Progress.h \
-	$(UPPDIR1)CtrlLib/PushCtrl.h \
-	$(UPPDIR1)CtrlLib/RichText.h \
-	$(UPPDIR1)CtrlLib/ScrollBar.h \
-	$(UPPDIR1)CtrlLib/SliderCtrl.h \
-	$(UPPDIR1)CtrlLib/Splitter.h \
-	$(UPPDIR1)CtrlLib/StaticCtrl.h \
-	$(UPPDIR1)CtrlLib/StatusBar.h \
-	$(UPPDIR1)CtrlLib/SuggestCtrl.h \
-	$(UPPDIR1)CtrlLib/TabCtrl.h \
-	$(UPPDIR1)CtrlLib/TextEdit.h \
-	$(UPPDIR1)CtrlLib/TreeCtrl.h \
-	$(UPPDIR1)Draw/Cham.h \
-	$(UPPDIR1)Draw/DDARasterizer.h \
-	$(UPPDIR1)Draw/Display.h \
-	$(UPPDIR1)Draw/Draw.h \
-	$(UPPDIR1)Draw/FontInt.h \
-	$(UPPDIR1)Draw/Image.h \
-	$(UPPDIR1)Draw/ImageOp.h \
-	$(UPPDIR1)Draw/iml_header.h \
-	$(UPPDIR1)Draw/Raster.h \
-	$(UPPDIR1)Draw/SDraw.h \
-	$(UPPDIR1)Draw/SIMD.h \
-	$(UPPDIR1)Esc/Esc.h \
-	$(UPPDIR1)guiplatform.h \
-	$(UPPDIR1)ide/clang/clang.h \
-	$(UPPDIR1)ide/clang/libclang.h \
-	$(UPPDIR1)ide/Common/Common.h \
-	$(UPPDIR1)ide/Core/Core.h \
-	$(UPPDIR1)ide/Core/Host.h \
-	$(UPPDIR1)ide/Core/Logger.h \
-	$(UPPDIR1)Painter/BufferPainter.h \
-	$(UPPDIR1)Painter/Interpolator.hpp \
-	$(UPPDIR1)Painter/LinearPath.h \
-	$(UPPDIR1)Painter/Painter.h \
-	$(UPPDIR1)Painter/Painter.hpp \
-	$(UPPDIR1)Painter/Painting.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/lz4/lz4.h \
-	$(UPPDIR1)plugin/lzma/lzma.h \
-	$(UPPDIR1)plugin/pcre/lib/pcre.h \
-	$(UPPDIR1)plugin/pcre/Pcre.h \
-	$(UPPDIR1)plugin/pcre/RegExp.h \
-	$(UPPDIR1)plugin/png/png.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/zstd/lib/zstd.h \
-	$(UPPDIR1)plugin/zstd/zstd.h \
-	$(UPPDIR1)RichText/Para.h \
-	$(UPPDIR1)RichText/RichText.h \
-	$(UPPDIR1)RichText/Table.h \
-	$(UPPDIR1)RichText/Text.h \
-	$(UPPDIR1)RichText/Txt.h \
-	$(UPPDIR1)uppconfig.h
-	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/libclang.cpp -o $(OutDir_ide_clang)libclang.o
-
 $(OutDir_ide_clang)clang.o: $(UPPDIR1)ide/clang/clang.cpp \
 	$(UPPDIR1)CodeEditor/CodeEditor.h \
 	$(UPPDIR1)CodeEditor/CSyntax.h \
@@ -46821,19 +46821,19 @@ $(OutDir_ide_clang)Indexer.o: $(UPPDIR1)ide/clang/Indexer.cpp \
 	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/Indexer.cpp -o $(OutDir_ide_clang)Indexer.o
 
 $(OutDir_ide_clang)clang.a: \
+	$(OutDir_ide_clang)libclang.o \
 	$(OutDir_ide_clang)util.o \
 	$(OutDir_ide_clang)macros.o \
 	$(OutDir_ide_clang)Signature.o \
-	$(OutDir_ide_clang)libclang.o \
 	$(OutDir_ide_clang)clang.o \
 	$(OutDir_ide_clang)Visitor.o \
 	$(OutDir_ide_clang)CurrentFile.o \
 	$(OutDir_ide_clang)Indexer.o
 	$(AR) $(OutDir_ide_clang)clang.a \
+		$(OutDir_ide_clang)libclang.o \
 		$(OutDir_ide_clang)util.o \
 		$(OutDir_ide_clang)macros.o \
 		$(OutDir_ide_clang)Signature.o \
-		$(OutDir_ide_clang)libclang.o \
 		$(OutDir_ide_clang)clang.o \
 		$(OutDir_ide_clang)Visitor.o \
 		$(OutDir_ide_clang)CurrentFile.o \
diff --git a/Makefile.in b/Makefile.in
index f8a6f366d..d9c8ff9fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45396,6 +45396,180 @@ $(OutDir_plugin_md)md.a: \
 $(OutDir_ide_clang):
 	mkdir -p $(OutDir_ide_clang)
 
+$(OutDir_ide_clang)libclang.o: $(UPPDIR1)ide/clang/libclang.cpp \
+	$(UPPDIR1)CodeEditor/CodeEditor.h \
+	$(UPPDIR1)CodeEditor/CSyntax.h \
+	$(UPPDIR1)CodeEditor/DiffSyntax.h \
+	$(UPPDIR1)CodeEditor/hl_color.i \
+	$(UPPDIR1)CodeEditor/LogSyntax.h \
+	$(UPPDIR1)CodeEditor/PythonSyntax.h \
+	$(UPPDIR1)CodeEditor/Syntax.h \
+	$(UPPDIR1)CodeEditor/TagSyntax.h \
+	$(UPPDIR1)Core/Algo.h \
+	$(UPPDIR1)Core/App.h \
+	$(UPPDIR1)Core/AString.hpp \
+	$(UPPDIR1)Core/Atomic.h \
+	$(UPPDIR1)Core/BiCont.h \
+	$(UPPDIR1)Core/Callback.h \
+	$(UPPDIR1)Core/CallbackN.i \
+	$(UPPDIR1)Core/CallbackNP.i \
+	$(UPPDIR1)Core/CallbackR.i \
+	$(UPPDIR1)Core/CharSet.h \
+	$(UPPDIR1)Core/CharSet.i \
+	$(UPPDIR1)Core/CoAlgo.h \
+	$(UPPDIR1)Core/Color.h \
+	$(UPPDIR1)Core/Complex.h \
+	$(UPPDIR1)Core/config.h \
+	$(UPPDIR1)Core/Convert.h \
+	$(UPPDIR1)Core/Convert.hpp \
+	$(UPPDIR1)Core/Core.h \
+	$(UPPDIR1)Core/CoSort.h \
+	$(UPPDIR1)Core/CoWork.h \
+	$(UPPDIR1)Core/Defs.h \
+	$(UPPDIR1)Core/Diag.h \
+	$(UPPDIR1)Core/dli.h \
+	$(UPPDIR1)Core/FilterStream.h \
+	$(UPPDIR1)Core/FixedMap.h \
+	$(UPPDIR1)Core/Fn.h \
+	$(UPPDIR1)Core/Format.h \
+	$(UPPDIR1)Core/Function.h \
+	$(UPPDIR1)Core/Gtypes.h \
+	$(UPPDIR1)Core/Hash.h \
+	$(UPPDIR1)Core/Heap.h \
+	$(UPPDIR1)Core/Huge.h \
+	$(UPPDIR1)Core/i18n.h \
+	$(UPPDIR1)Core/Index.h \
+	$(UPPDIR1)Core/Index.hpp \
+	$(UPPDIR1)Core/Inet.h \
+	$(UPPDIR1)Core/InMap.hpp \
+	$(UPPDIR1)Core/InVector.h \
+	$(UPPDIR1)Core/InVector.hpp \
+	$(UPPDIR1)Core/JSON.h \
+	$(UPPDIR1)Core/Lang.h \
+	$(UPPDIR1)Core/Lang_s.h \
+	$(UPPDIR1)Core/lib/lz4.h \
+	$(UPPDIR1)Core/LocalProcess.h \
+	$(UPPDIR1)Core/Map.h \
+	$(UPPDIR1)Core/Map.hpp \
+	$(UPPDIR1)Core/Mem.h \
+	$(UPPDIR1)Core/Mt.h \
+	$(UPPDIR1)Core/mt_.h \
+	$(UPPDIR1)Core/Obsolete.h \
+	$(UPPDIR1)Core/Ops.h \
+	$(UPPDIR1)Core/Other.h \
+	$(UPPDIR1)Core/Other.hpp \
+	$(UPPDIR1)Core/Parser.h \
+	$(UPPDIR1)Core/Path.h \
+	$(UPPDIR1)Core/Profile.h \
+	$(UPPDIR1)Core/Ptr.h \
+	$(UPPDIR1)Core/Range.h \
+	$(UPPDIR1)Core/SIMD_NEON.h \
+	$(UPPDIR1)Core/SIMD_SSE2.h \
+	$(UPPDIR1)Core/Sort.h \
+	$(UPPDIR1)Core/Sorted.h \
+	$(UPPDIR1)Core/SplitMerge.h \
+	$(UPPDIR1)Core/Stream.h \
+	$(UPPDIR1)Core/String.h \
+	$(UPPDIR1)Core/t_.h \
+	$(UPPDIR1)Core/TimeDate.h \
+	$(UPPDIR1)Core/Topic.h \
+	$(UPPDIR1)Core/Topt.h \
+	$(UPPDIR1)Core/Tuple.h \
+	$(UPPDIR1)Core/Utf.hpp \
+	$(UPPDIR1)Core/Util.h \
+	$(UPPDIR1)Core/Uuid.h \
+	$(UPPDIR1)Core/Value.h \
+	$(UPPDIR1)Core/Value.hpp \
+	$(UPPDIR1)Core/ValueCache.h \
+	$(UPPDIR1)Core/ValueUtil.h \
+	$(UPPDIR1)Core/ValueUtil.hpp \
+	$(UPPDIR1)Core/Vcont.h \
+	$(UPPDIR1)Core/Vcont.hpp \
+	$(UPPDIR1)Core/Win32Util.h \
+	$(UPPDIR1)Core/XML.h \
+	$(UPPDIR1)Core/Xmlize.h \
+	$(UPPDIR1)Core/Xmlize.hpp \
+	$(UPPDIR1)Core/z.h \
+	$(UPPDIR1)CtrlCore/CtrlCore.h \
+	$(UPPDIR1)CtrlCore/lay.h \
+	$(UPPDIR1)CtrlCore/lay0.h \
+	$(UPPDIR1)CtrlCore/MKeys.h \
+	$(UPPDIR1)CtrlCore/TopWindow.h \
+	$(UPPDIR1)CtrlLib/AKeys.h \
+	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
+	$(UPPDIR1)CtrlLib/Bar.h \
+	$(UPPDIR1)CtrlLib/Ch.h \
+	$(UPPDIR1)CtrlLib/ColumnList.h \
+	$(UPPDIR1)CtrlLib/CtrlLib.h \
+	$(UPPDIR1)CtrlLib/CtrlUtil.h \
+	$(UPPDIR1)CtrlLib/DateTimeCtrl.h \
+	$(UPPDIR1)CtrlLib/DisplayPopup.h \
+	$(UPPDIR1)CtrlLib/DlgColor.h \
+	$(UPPDIR1)CtrlLib/DropChoice.h \
+	$(UPPDIR1)CtrlLib/EditCtrl.h \
+	$(UPPDIR1)CtrlLib/EditCtrl.hpp \
+	$(UPPDIR1)CtrlLib/FileSel.h \
+	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
+	$(UPPDIR1)CtrlLib/LabelBase.h \
+	$(UPPDIR1)CtrlLib/Lang.h \
+	$(UPPDIR1)CtrlLib/MultiButton.h \
+	$(UPPDIR1)CtrlLib/Progress.h \
+	$(UPPDIR1)CtrlLib/PushCtrl.h \
+	$(UPPDIR1)CtrlLib/RichText.h \
+	$(UPPDIR1)CtrlLib/ScrollBar.h \
+	$(UPPDIR1)CtrlLib/SliderCtrl.h \
+	$(UPPDIR1)CtrlLib/Splitter.h \
+	$(UPPDIR1)CtrlLib/StaticCtrl.h \
+	$(UPPDIR1)CtrlLib/StatusBar.h \
+	$(UPPDIR1)CtrlLib/SuggestCtrl.h \
+	$(UPPDIR1)CtrlLib/TabCtrl.h \
+	$(UPPDIR1)CtrlLib/TextEdit.h \
+	$(UPPDIR1)CtrlLib/TreeCtrl.h \
+	$(UPPDIR1)Draw/Cham.h \
+	$(UPPDIR1)Draw/DDARasterizer.h \
+	$(UPPDIR1)Draw/Display.h \
+	$(UPPDIR1)Draw/Draw.h \
+	$(UPPDIR1)Draw/FontInt.h \
+	$(UPPDIR1)Draw/Image.h \
+	$(UPPDIR1)Draw/ImageOp.h \
+	$(UPPDIR1)Draw/iml_header.h \
+	$(UPPDIR1)Draw/Raster.h \
+	$(UPPDIR1)Draw/SDraw.h \
+	$(UPPDIR1)Draw/SIMD.h \
+	$(UPPDIR1)Esc/Esc.h \
+	$(UPPDIR1)guiplatform.h \
+	$(UPPDIR1)ide/clang/clang.h \
+	$(UPPDIR1)ide/clang/libclang.h \
+	$(UPPDIR1)ide/Common/Common.h \
+	$(UPPDIR1)ide/Core/Core.h \
+	$(UPPDIR1)ide/Core/Host.h \
+	$(UPPDIR1)ide/Core/Logger.h \
+	$(UPPDIR1)Painter/BufferPainter.h \
+	$(UPPDIR1)Painter/Interpolator.hpp \
+	$(UPPDIR1)Painter/LinearPath.h \
+	$(UPPDIR1)Painter/Painter.h \
+	$(UPPDIR1)Painter/Painter.hpp \
+	$(UPPDIR1)Painter/Painting.h \
+	$(UPPDIR1)plugin/bz2/bz2.h \
+	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
+	$(UPPDIR1)plugin/lz4/lz4.h \
+	$(UPPDIR1)plugin/lzma/lzma.h \
+	$(UPPDIR1)plugin/pcre/lib/pcre.h \
+	$(UPPDIR1)plugin/pcre/Pcre.h \
+	$(UPPDIR1)plugin/pcre/RegExp.h \
+	$(UPPDIR1)plugin/png/png.h \
+	$(UPPDIR1)plugin/z/lib/zconf.h \
+	$(UPPDIR1)plugin/z/lib/zlib.h \
+	$(UPPDIR1)plugin/zstd/lib/zstd.h \
+	$(UPPDIR1)plugin/zstd/zstd.h \
+	$(UPPDIR1)RichText/Para.h \
+	$(UPPDIR1)RichText/RichText.h \
+	$(UPPDIR1)RichText/Table.h \
+	$(UPPDIR1)RichText/Text.h \
+	$(UPPDIR1)RichText/Txt.h \
+	$(UPPDIR1)uppconfig.h
+	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/libclang.cpp -o $(OutDir_ide_clang)libclang.o
+
 $(OutDir_ide_clang)util.o: $(UPPDIR1)ide/clang/util.cpp \
 	$(UPPDIR1)CodeEditor/CodeEditor.h \
 	$(UPPDIR1)CodeEditor/CSyntax.h \
@@ -45915,180 +46089,6 @@ $(OutDir_ide_clang)Signature.o: $(UPPDIR1)ide/clang/Signature.cpp \
 	$(UPPDIR1)uppconfig.h
 	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/Signature.cpp -o $(OutDir_ide_clang)Signature.o
 
-$(OutDir_ide_clang)libclang.o: $(UPPDIR1)ide/clang/libclang.cpp \
-	$(UPPDIR1)CodeEditor/CodeEditor.h \
-	$(UPPDIR1)CodeEditor/CSyntax.h \
-	$(UPPDIR1)CodeEditor/DiffSyntax.h \
-	$(UPPDIR1)CodeEditor/hl_color.i \
-	$(UPPDIR1)CodeEditor/LogSyntax.h \
-	$(UPPDIR1)CodeEditor/PythonSyntax.h \
-	$(UPPDIR1)CodeEditor/Syntax.h \
-	$(UPPDIR1)CodeEditor/TagSyntax.h \
-	$(UPPDIR1)Core/Algo.h \
-	$(UPPDIR1)Core/App.h \
-	$(UPPDIR1)Core/AString.hpp \
-	$(UPPDIR1)Core/Atomic.h \
-	$(UPPDIR1)Core/BiCont.h \
-	$(UPPDIR1)Core/Callback.h \
-	$(UPPDIR1)Core/CallbackN.i \
-	$(UPPDIR1)Core/CallbackNP.i \
-	$(UPPDIR1)Core/CallbackR.i \
-	$(UPPDIR1)Core/CharSet.h \
-	$(UPPDIR1)Core/CharSet.i \
-	$(UPPDIR1)Core/CoAlgo.h \
-	$(UPPDIR1)Core/Color.h \
-	$(UPPDIR1)Core/Complex.h \
-	$(UPPDIR1)Core/config.h \
-	$(UPPDIR1)Core/Convert.h \
-	$(UPPDIR1)Core/Convert.hpp \
-	$(UPPDIR1)Core/Core.h \
-	$(UPPDIR1)Core/CoSort.h \
-	$(UPPDIR1)Core/CoWork.h \
-	$(UPPDIR1)Core/Defs.h \
-	$(UPPDIR1)Core/Diag.h \
-	$(UPPDIR1)Core/dli.h \
-	$(UPPDIR1)Core/FilterStream.h \
-	$(UPPDIR1)Core/FixedMap.h \
-	$(UPPDIR1)Core/Fn.h \
-	$(UPPDIR1)Core/Format.h \
-	$(UPPDIR1)Core/Function.h \
-	$(UPPDIR1)Core/Gtypes.h \
-	$(UPPDIR1)Core/Hash.h \
-	$(UPPDIR1)Core/Heap.h \
-	$(UPPDIR1)Core/Huge.h \
-	$(UPPDIR1)Core/i18n.h \
-	$(UPPDIR1)Core/Index.h \
-	$(UPPDIR1)Core/Index.hpp \
-	$(UPPDIR1)Core/Inet.h \
-	$(UPPDIR1)Core/InMap.hpp \
-	$(UPPDIR1)Core/InVector.h \
-	$(UPPDIR1)Core/InVector.hpp \
-	$(UPPDIR1)Core/JSON.h \
-	$(UPPDIR1)Core/Lang.h \
-	$(UPPDIR1)Core/Lang_s.h \
-	$(UPPDIR1)Core/lib/lz4.h \
-	$(UPPDIR1)Core/LocalProcess.h \
-	$(UPPDIR1)Core/Map.h \
-	$(UPPDIR1)Core/Map.hpp \
-	$(UPPDIR1)Core/Mem.h \
-	$(UPPDIR1)Core/Mt.h \
-	$(UPPDIR1)Core/mt_.h \
-	$(UPPDIR1)Core/Obsolete.h \
-	$(UPPDIR1)Core/Ops.h \
-	$(UPPDIR1)Core/Other.h \
-	$(UPPDIR1)Core/Other.hpp \
-	$(UPPDIR1)Core/Parser.h \
-	$(UPPDIR1)Core/Path.h \
-	$(UPPDIR1)Core/Profile.h \
-	$(UPPDIR1)Core/Ptr.h \
-	$(UPPDIR1)Core/Range.h \
-	$(UPPDIR1)Core/SIMD_NEON.h \
-	$(UPPDIR1)Core/SIMD_SSE2.h \
-	$(UPPDIR1)Core/Sort.h \
-	$(UPPDIR1)Core/Sorted.h \
-	$(UPPDIR1)Core/SplitMerge.h \
-	$(UPPDIR1)Core/Stream.h \
-	$(UPPDIR1)Core/String.h \
-	$(UPPDIR1)Core/t_.h \
-	$(UPPDIR1)Core/TimeDate.h \
-	$(UPPDIR1)Core/Topic.h \
-	$(UPPDIR1)Core/Topt.h \
-	$(UPPDIR1)Core/Tuple.h \
-	$(UPPDIR1)Core/Utf.hpp \
-	$(UPPDIR1)Core/Util.h \
-	$(UPPDIR1)Core/Uuid.h \
-	$(UPPDIR1)Core/Value.h \
-	$(UPPDIR1)Core/Value.hpp \
-	$(UPPDIR1)Core/ValueCache.h \
-	$(UPPDIR1)Core/ValueUtil.h \
-	$(UPPDIR1)Core/ValueUtil.hpp \
-	$(UPPDIR1)Core/Vcont.h \
-	$(UPPDIR1)Core/Vcont.hpp \
-	$(UPPDIR1)Core/Win32Util.h \
-	$(UPPDIR1)Core/XML.h \
-	$(UPPDIR1)Core/Xmlize.h \
-	$(UPPDIR1)Core/Xmlize.hpp \
-	$(UPPDIR1)Core/z.h \
-	$(UPPDIR1)CtrlCore/CtrlCore.h \
-	$(UPPDIR1)CtrlCore/lay.h \
-	$(UPPDIR1)CtrlCore/lay0.h \
-	$(UPPDIR1)CtrlCore/MKeys.h \
-	$(UPPDIR1)CtrlCore/TopWindow.h \
-	$(UPPDIR1)CtrlLib/AKeys.h \
-	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
-	$(UPPDIR1)CtrlLib/Bar.h \
-	$(UPPDIR1)CtrlLib/Ch.h \
-	$(UPPDIR1)CtrlLib/ColumnList.h \
-	$(UPPDIR1)CtrlLib/CtrlLib.h \
-	$(UPPDIR1)CtrlLib/CtrlUtil.h \
-	$(UPPDIR1)CtrlLib/DateTimeCtrl.h \
-	$(UPPDIR1)CtrlLib/DisplayPopup.h \
-	$(UPPDIR1)CtrlLib/DlgColor.h \
-	$(UPPDIR1)CtrlLib/DropChoice.h \
-	$(UPPDIR1)CtrlLib/EditCtrl.h \
-	$(UPPDIR1)CtrlLib/EditCtrl.hpp \
-	$(UPPDIR1)CtrlLib/FileSel.h \
-	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
-	$(UPPDIR1)CtrlLib/LabelBase.h \
-	$(UPPDIR1)CtrlLib/Lang.h \
-	$(UPPDIR1)CtrlLib/MultiButton.h \
-	$(UPPDIR1)CtrlLib/Progress.h \
-	$(UPPDIR1)CtrlLib/PushCtrl.h \
-	$(UPPDIR1)CtrlLib/RichText.h \
-	$(UPPDIR1)CtrlLib/ScrollBar.h \
-	$(UPPDIR1)CtrlLib/SliderCtrl.h \
-	$(UPPDIR1)CtrlLib/Splitter.h \
-	$(UPPDIR1)CtrlLib/StaticCtrl.h \
-	$(UPPDIR1)CtrlLib/StatusBar.h \
-	$(UPPDIR1)CtrlLib/SuggestCtrl.h \
-	$(UPPDIR1)CtrlLib/TabCtrl.h \
-	$(UPPDIR1)CtrlLib/TextEdit.h \
-	$(UPPDIR1)CtrlLib/TreeCtrl.h \
-	$(UPPDIR1)Draw/Cham.h \
-	$(UPPDIR1)Draw/DDARasterizer.h \
-	$(UPPDIR1)Draw/Display.h \
-	$(UPPDIR1)Draw/Draw.h \
-	$(UPPDIR1)Draw/FontInt.h \
-	$(UPPDIR1)Draw/Image.h \
-	$(UPPDIR1)Draw/ImageOp.h \
-	$(UPPDIR1)Draw/iml_header.h \
-	$(UPPDIR1)Draw/Raster.h \
-	$(UPPDIR1)Draw/SDraw.h \
-	$(UPPDIR1)Draw/SIMD.h \
-	$(UPPDIR1)Esc/Esc.h \
-	$(UPPDIR1)guiplatform.h \
-	$(UPPDIR1)ide/clang/clang.h \
-	$(UPPDIR1)ide/clang/libclang.h \
-	$(UPPDIR1)ide/Common/Common.h \
-	$(UPPDIR1)ide/Core/Core.h \
-	$(UPPDIR1)ide/Core/Host.h \
-	$(UPPDIR1)ide/Core/Logger.h \
-	$(UPPDIR1)Painter/BufferPainter.h \
-	$(UPPDIR1)Painter/Interpolator.hpp \
-	$(UPPDIR1)Painter/LinearPath.h \
-	$(UPPDIR1)Painter/Painter.h \
-	$(UPPDIR1)Painter/Painter.hpp \
-	$(UPPDIR1)Painter/Painting.h \
-	$(UPPDIR1)plugin/bz2/bz2.h \
-	$(UPPDIR1)plugin/bz2/lib/bzlib.h \
-	$(UPPDIR1)plugin/lz4/lz4.h \
-	$(UPPDIR1)plugin/lzma/lzma.h \
-	$(UPPDIR1)plugin/pcre/lib/pcre.h \
-	$(UPPDIR1)plugin/pcre/Pcre.h \
-	$(UPPDIR1)plugin/pcre/RegExp.h \
-	$(UPPDIR1)plugin/png/png.h \
-	$(UPPDIR1)plugin/z/lib/zconf.h \
-	$(UPPDIR1)plugin/z/lib/zlib.h \
-	$(UPPDIR1)plugin/zstd/lib/zstd.h \
-	$(UPPDIR1)plugin/zstd/zstd.h \
-	$(UPPDIR1)RichText/Para.h \
-	$(UPPDIR1)RichText/RichText.h \
-	$(UPPDIR1)RichText/Table.h \
-	$(UPPDIR1)RichText/Text.h \
-	$(UPPDIR1)RichText/Txt.h \
-	$(UPPDIR1)uppconfig.h
-	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/libclang.cpp -o $(OutDir_ide_clang)libclang.o
-
 $(OutDir_ide_clang)clang.o: $(UPPDIR1)ide/clang/clang.cpp \
 	$(UPPDIR1)CodeEditor/CodeEditor.h \
 	$(UPPDIR1)CodeEditor/CSyntax.h \
@@ -46821,19 +46821,19 @@ $(OutDir_ide_clang)Indexer.o: $(UPPDIR1)ide/clang/Indexer.cpp \
 	$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang)  $(UPPDIR1)ide/clang/Indexer.cpp -o $(OutDir_ide_clang)Indexer.o
 
 $(OutDir_ide_clang)clang.a: \
+	$(OutDir_ide_clang)libclang.o \
 	$(OutDir_ide_clang)util.o \
 	$(OutDir_ide_clang)macros.o \
 	$(OutDir_ide_clang)Signature.o \
-	$(OutDir_ide_clang)libclang.o \
 	$(OutDir_ide_clang)clang.o \
 	$(OutDir_ide_clang)Visitor.o \
 	$(OutDir_ide_clang)CurrentFile.o \
 	$(OutDir_ide_clang)Indexer.o
 	$(AR) $(OutDir_ide_clang)clang.a \
+		$(OutDir_ide_clang)libclang.o \
 		$(OutDir_ide_clang)util.o \
 		$(OutDir_ide_clang)macros.o \
 		$(OutDir_ide_clang)Signature.o \
-		$(OutDir_ide_clang)libclang.o \
 		$(OutDir_ide_clang)clang.o \
 		$(OutDir_ide_clang)Visitor.o \
 		$(OutDir_ide_clang)CurrentFile.o \