mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-15 14:16:07 -06:00
Merge branch 'master' of https://github.com/ultimatepp/ultimatepp
This commit is contained in:
Mirek Fidler
commit
3fa50d27f1
14 changed files with 9458 additions and 870 deletions
189
Makefile
189
Makefile
|
|
@ -50314,193 +50314,6 @@ $(OutDir_ide_clang)util.o: $(UPPDIR1)ide/clang/util.cpp \
|
|||
$(UPPDIR1)uppconfig.h
|
||||
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang) $(UPPDIR1)ide/clang/util.cpp -o $(OutDir_ide_clang)util.o
|
||||
|
||||
$(OutDir_ide_clang)macros.o: $(UPPDIR1)ide/clang/macros.cpp \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.h \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.iml \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.lay \
|
||||
$(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/BinUndoRedo.h \
|
||||
$(UPPDIR1)Core/Callback.h \
|
||||
$(UPPDIR1)Core/CallbackN.i \
|
||||
$(UPPDIR1)Core/CallbackNP.i \
|
||||
$(UPPDIR1)Core/CallbackR.i \
|
||||
$(UPPDIR1)Core/CharFilter.h \
|
||||
$(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/FileMapping.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/HttpStatusCode.i \
|
||||
$(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/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/CtrlCore.iml \
|
||||
$(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/Ctrl.iml \
|
||||
$(UPPDIR1)CtrlLib/Ctrl.lay \
|
||||
$(UPPDIR1)CtrlLib/CtrlLib.h \
|
||||
$(UPPDIR1)CtrlLib/Ctrls.iml \
|
||||
$(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/DrawImg.iml \
|
||||
$(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/macros.cpp \
|
||||
$(UPPDIR1)ide/Common/Common.h \
|
||||
$(UPPDIR1)ide/Common/common.iml \
|
||||
$(UPPDIR1)ide/Core/Core.h \
|
||||
$(UPPDIR1)ide/Core/Host.h \
|
||||
$(UPPDIR1)ide/Core/Logger.h \
|
||||
$(UPPDIR1)Painter/BufferPainter.h \
|
||||
$(UPPDIR1)Painter/LinearPath.h \
|
||||
$(UPPDIR1)Painter/Painter.h \
|
||||
$(UPPDIR1)Painter/Painter.hpp \
|
||||
$(UPPDIR1)Painter/Painting.h \
|
||||
$(UPPDIR1)plugin/bz2/bz2.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/zstd/lib/zstd.h \
|
||||
$(UPPDIR1)plugin/zstd/zstd.h \
|
||||
$(UPPDIR1)RichEdit/Diagram.iml \
|
||||
$(UPPDIR1)RichEdit/Diagram.lay \
|
||||
$(UPPDIR1)RichEdit/DiagramEditor.h \
|
||||
$(UPPDIR1)RichEdit/RichEdit.h \
|
||||
$(UPPDIR1)RichEdit/RichEdit.iml \
|
||||
$(UPPDIR1)RichEdit/RichEdit.lay \
|
||||
$(UPPDIR1)RichText/Diagram.h \
|
||||
$(UPPDIR1)RichText/Para.h \
|
||||
$(UPPDIR1)RichText/RichText.h \
|
||||
$(UPPDIR1)RichText/RichText.iml \
|
||||
$(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/macros.cpp -o $(OutDir_ide_clang)macros.o
|
||||
|
||||
$(OutDir_ide_clang)clang.o: $(UPPDIR1)ide/clang/clang.cpp \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.h \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.iml \
|
||||
|
|
@ -51302,7 +51115,6 @@ $(OutDir_ide_clang)Indexer.o: $(UPPDIR1)ide/clang/Indexer.cpp \
|
|||
$(OutDir_ide_clang)clang.a: \
|
||||
$(OutDir_ide_clang)libclang.o \
|
||||
$(OutDir_ide_clang)util.o \
|
||||
$(OutDir_ide_clang)macros.o \
|
||||
$(OutDir_ide_clang)clang.o \
|
||||
$(OutDir_ide_clang)Visitor.o \
|
||||
$(OutDir_ide_clang)CurrentFile.o \
|
||||
|
|
@ -51310,7 +51122,6 @@ $(OutDir_ide_clang)clang.a: \
|
|||
$(AR) $(OutDir_ide_clang)clang.a \
|
||||
$(OutDir_ide_clang)libclang.o \
|
||||
$(OutDir_ide_clang)util.o \
|
||||
$(OutDir_ide_clang)macros.o \
|
||||
$(OutDir_ide_clang)clang.o \
|
||||
$(OutDir_ide_clang)Visitor.o \
|
||||
$(OutDir_ide_clang)CurrentFile.o \
|
||||
|
|
|
|||
189
Makefile.in
189
Makefile.in
|
|
@ -50314,193 +50314,6 @@ $(OutDir_ide_clang)util.o: $(UPPDIR1)ide/clang/util.cpp \
|
|||
$(UPPDIR1)uppconfig.h
|
||||
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_ide_clang) $(UPPDIR1)ide/clang/util.cpp -o $(OutDir_ide_clang)util.o
|
||||
|
||||
$(OutDir_ide_clang)macros.o: $(UPPDIR1)ide/clang/macros.cpp \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.h \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.iml \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.lay \
|
||||
$(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/BinUndoRedo.h \
|
||||
$(UPPDIR1)Core/Callback.h \
|
||||
$(UPPDIR1)Core/CallbackN.i \
|
||||
$(UPPDIR1)Core/CallbackNP.i \
|
||||
$(UPPDIR1)Core/CallbackR.i \
|
||||
$(UPPDIR1)Core/CharFilter.h \
|
||||
$(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/FileMapping.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/HttpStatusCode.i \
|
||||
$(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/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/CtrlCore.iml \
|
||||
$(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/Ctrl.iml \
|
||||
$(UPPDIR1)CtrlLib/Ctrl.lay \
|
||||
$(UPPDIR1)CtrlLib/CtrlLib.h \
|
||||
$(UPPDIR1)CtrlLib/Ctrls.iml \
|
||||
$(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/DrawImg.iml \
|
||||
$(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/macros.cpp \
|
||||
$(UPPDIR1)ide/Common/Common.h \
|
||||
$(UPPDIR1)ide/Common/common.iml \
|
||||
$(UPPDIR1)ide/Core/Core.h \
|
||||
$(UPPDIR1)ide/Core/Host.h \
|
||||
$(UPPDIR1)ide/Core/Logger.h \
|
||||
$(UPPDIR1)Painter/BufferPainter.h \
|
||||
$(UPPDIR1)Painter/LinearPath.h \
|
||||
$(UPPDIR1)Painter/Painter.h \
|
||||
$(UPPDIR1)Painter/Painter.hpp \
|
||||
$(UPPDIR1)Painter/Painting.h \
|
||||
$(UPPDIR1)plugin/bz2/bz2.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/zstd/lib/zstd.h \
|
||||
$(UPPDIR1)plugin/zstd/zstd.h \
|
||||
$(UPPDIR1)RichEdit/Diagram.iml \
|
||||
$(UPPDIR1)RichEdit/Diagram.lay \
|
||||
$(UPPDIR1)RichEdit/DiagramEditor.h \
|
||||
$(UPPDIR1)RichEdit/RichEdit.h \
|
||||
$(UPPDIR1)RichEdit/RichEdit.iml \
|
||||
$(UPPDIR1)RichEdit/RichEdit.lay \
|
||||
$(UPPDIR1)RichText/Diagram.h \
|
||||
$(UPPDIR1)RichText/Para.h \
|
||||
$(UPPDIR1)RichText/RichText.h \
|
||||
$(UPPDIR1)RichText/RichText.iml \
|
||||
$(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/macros.cpp -o $(OutDir_ide_clang)macros.o
|
||||
|
||||
$(OutDir_ide_clang)clang.o: $(UPPDIR1)ide/clang/clang.cpp \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.h \
|
||||
$(UPPDIR1)CodeEditor/CodeEditor.iml \
|
||||
|
|
@ -51302,7 +51115,6 @@ $(OutDir_ide_clang)Indexer.o: $(UPPDIR1)ide/clang/Indexer.cpp \
|
|||
$(OutDir_ide_clang)clang.a: \
|
||||
$(OutDir_ide_clang)libclang.o \
|
||||
$(OutDir_ide_clang)util.o \
|
||||
$(OutDir_ide_clang)macros.o \
|
||||
$(OutDir_ide_clang)clang.o \
|
||||
$(OutDir_ide_clang)Visitor.o \
|
||||
$(OutDir_ide_clang)CurrentFile.o \
|
||||
|
|
@ -51310,7 +51122,6 @@ $(OutDir_ide_clang)clang.a: \
|
|||
$(AR) $(OutDir_ide_clang)clang.a \
|
||||
$(OutDir_ide_clang)libclang.o \
|
||||
$(OutDir_ide_clang)util.o \
|
||||
$(OutDir_ide_clang)macros.o \
|
||||
$(OutDir_ide_clang)clang.o \
|
||||
$(OutDir_ide_clang)Visitor.o \
|
||||
$(OutDir_ide_clang)CurrentFile.o \
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ uses
|
|||
file
|
||||
main.cpp,
|
||||
SVG readonly separator,
|
||||
svg\biplane.svg,
|
||||
svg\altum_angelfish_01.svg,
|
||||
svg\brown_fish_01.svg,
|
||||
svg\matrix.svg,
|
||||
|
|
@ -18,6 +19,7 @@ file
|
|||
svg\rg1024_Presentation_with_girl.svg,
|
||||
svg\symbol.svg,
|
||||
svg\idtest.svg,
|
||||
svg\wooden-easter-egg-holder.svg,
|
||||
svg\yinyang.svg;
|
||||
|
||||
mainconfig
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ SvgView::SvgView()
|
|||
|
||||
Sizeable().Zoomable();
|
||||
|
||||
AddFrame(splitter.Left(files, 200));
|
||||
AddFrame(splitter.Left(files, DPI(200)));
|
||||
|
||||
dir = GetDataFile("svg");
|
||||
}
|
||||
|
|
|
|||
298
examples/SVGView/svg/biplane.svg
Normal file
298
examples/SVGView/svg/biplane.svg
Normal file
|
|
@ -0,0 +1,298 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="941.66"
|
||||
height="843.39"
|
||||
viewBox="0 0 941.66 843.39"
|
||||
version="1.1"
|
||||
id="svg19"
|
||||
sodipodi:docname="free-download-laser-cut-biplane-airplane-plans.svg"
|
||||
inkscape:version="1.4 (86a8ad7, 2024-10-11)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<title
|
||||
id="title19">Free 3D Biplane Model SVG Files for Laser Cutting</title>
|
||||
<sodipodi:namedview
|
||||
id="namedview19"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:zoom="0.9283961"
|
||||
inkscape:cx="471.24282"
|
||||
inkscape:cy="421.69501"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1001"
|
||||
inkscape:window-x="-9"
|
||||
inkscape:window-y="-9"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg19" />
|
||||
<defs
|
||||
id="defs1">
|
||||
<style
|
||||
id="style1">
|
||||
.cls-1 {
|
||||
fill: none;
|
||||
stroke: #000;
|
||||
stroke-linecap: round;
|
||||
stroke-linejoin: round;
|
||||
stroke-width: 1.25px;
|
||||
}
|
||||
|
||||
.cls-2 {
|
||||
font-family: TimesNewRomanPSMT, 'Times New Roman';
|
||||
font-size: 22.5px;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<g
|
||||
id="_0"
|
||||
data-name="0">
|
||||
<g
|
||||
id="TEXT">
|
||||
<text
|
||||
class="cls-2"
|
||||
transform="translate(386.83 811.66)"
|
||||
id="text1"><tspan
|
||||
x="0"
|
||||
y="0"
|
||||
id="tspan1">templatesarea.com</tspan></text>
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="templatesarea.com">
|
||||
<g
|
||||
id="CIRCLE">
|
||||
<circle
|
||||
class="cls-1"
|
||||
cx="828.7"
|
||||
cy="515.76"
|
||||
r="15.07"
|
||||
id="circle1" />
|
||||
</g>
|
||||
<g
|
||||
id="CIRCLE-2"
|
||||
data-name="CIRCLE">
|
||||
<circle
|
||||
class="cls-1"
|
||||
cx="828.7"
|
||||
cy="515.76"
|
||||
r="36.85"
|
||||
id="circle2" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M789.05,52.8c3.58,8,9.08,15.91,16.86,20.82,10.22,6.45,24.39,7.71,36.57,5.13s23.28-9.58,30.24-19.41c4.89-6.91,8.01-15.27,10.49-23.58,1.05-3.54,1.99-7.06,2.93-10.58h8.5v36.19h18.95c0,23.38,0,46.76,0,70.14,0,6.64-4.7,11.34-11.34,11.34h-7.62v-51.84h-8.5v51.84h-100.09v-43.89h-8.5v43.89h-39.67c-4.35-.02-8.71-.04-13.05-.38-8.79-.69-17.55-2.69-25.76-5.94-12.12-4.8-23.07-12.33-32.73-21.19-9.03-8.28-16.93-17.73-21.67-29.3-2.52-6.16-4.15-12.92-2.58-19.33,1.12-4.59,3.87-8.99,7.83-11.44,1.75-1.08,3.73-1.79,5.97-2.21.87-.16,1.75-.25,2.63-.25,43.52,0,87.04,0,130.56,0"
|
||||
id="path2" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-2"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M339.16,204.88v60.99c-62.35-13.29-124.71-26.57-187.06-39.86-1.11,3.81-2.23,7.61-3.46,11.37-5.61,17.24-13.37,33.56-23.09,49.38-5.33,8.68-11.25,17.2-19.71,22.49-11.94,7.47-28.94,8.49-42.16,2.87-10.9-4.63-19.23-13.78-25.17-24.09-7.21-12.53-10.88-26.8-10.41-41.03.3-9.18,2.33-18.35,6.41-26.54,2.47-4.96,5.69-9.56,9.52-13.52.11-.11.22-.23.33-.34,3.46-3.51,3.46-8.44,0-11.94-.11-.11-.22-.23-.33-.34-3.83-3.96-7.05-8.56-9.52-13.52-4.08-8.19-6.1-17.36-6.41-26.54-.47-14.23,3.2-28.5,10.41-41.03,5.94-10.31,14.27-19.46,25.17-24.09,13.22-5.62,30.22-4.61,42.16,2.87,8.45,5.29,14.37,13.81,19.71,22.49,9.72,15.82,17.47,32.14,23.09,49.38,1.22,3.76,2.35,7.56,3.46,11.37l187.06-39.86v60.99h-146.88v8.5h146.88Z"
|
||||
id="path3" />
|
||||
</g>
|
||||
<g
|
||||
id="CIRCLE-3"
|
||||
data-name="CIRCLE">
|
||||
<circle
|
||||
class="cls-1"
|
||||
cx="177.08"
|
||||
cy="55.98"
|
||||
r="15.75"
|
||||
id="circle3" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-3"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M201.31,70.58c2.45-4.06,6.74-6.07,11.43-5.36,5.05.77,10.11,1.56,15.17,2.38,13.64,2.21,27.37,4.67,40.85,6.51,11.18,1.52,22.2,2.61,34.25,1.08,6.6-.84,13.51-2.46,17.74-6.99,2.15-2.3,3.6-5.35,4.25-8.59.24-1.2.37-2.43.36-3.63,0-1.2-.12-2.43-.36-3.63-.65-3.24-2.11-6.29-4.25-8.59-4.23-4.53-11.14-6.16-17.74-6.99-12.05-1.53-23.07-.44-34.25,1.08-13.48,1.83-27.21,4.29-40.85,6.51-5.07.82-10.12,1.61-15.17,2.38-4.69.72-8.98-1.3-11.43-5.36-5.24-8.7-14.08-13.69-24.23-13.69s-18.99,4.99-24.23,13.69c-2.45,4.06-6.74,6.07-11.43,5.36-5.05-.77-10.11-1.56-15.17-2.38-13.64-2.21-27.37-4.67-40.85-6.51-11.18-1.52-22.2-2.61-34.25-1.08-6.6.84-13.51,2.46-17.74,6.99-2.15,2.3-3.6,5.35-4.25,8.59-.24,1.2-.37,2.43-.36,3.63,0,1.2.12,2.43.36,3.63.65,3.24,2.11,6.29,4.25,8.59,4.23,4.53,11.14,6.16,17.74,6.99,12.05,1.53,23.07.44,34.25-1.08,13.48-1.83,27.21-4.29,40.85-6.51,5.07-.82,10.12-1.61,15.17-2.38,4.69-.72,8.98,1.3,11.43,5.36,5.24,8.7,14.08,13.69,24.23,13.69s18.99-4.99,24.23-13.69Z"
|
||||
id="path4" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M555.66,183.38v-1.66c0-4.7,3.81-8.5,8.5-8.5h16.12l2.48-6.32h16.6c9.39,0,17.01,7.61,17.01,17.01v24.68l51.45,46.25c18.79-10.67,41.8-10.67,60.58,0l51.45-46.25v-24.68c0-9.39,7.61-17.01,17.01-17.01h16.6l2.48,6.32h16.12c4.7,0,8.5,3.81,8.5,8.5v1.66h-15.55v8.5h15.55v1.66c0,4.7-3.81,8.5-8.5,8.5h-16.12l-2.48,6.32-5.26.04-48.5,61.65c5.6,26.04,8.69,52.55,9.24,79.18-4.82,6.79-10.73,12.73-17.5,17.57v-46.49h-8.5v29.9h-40.57v-29.9h-8.5v29.9h-40.57s0-29.9,0-29.9h-8.5v46.49c-6.77-4.85-12.68-10.79-17.5-17.57.55-26.63,3.64-53.14,9.24-79.18l-48.5-61.65-5.26-.04-2.48-6.32h-16.12c-4.7,0-8.5-3.81-8.5-8.5v-1.66h15.55v-8.5h-15.55Z"
|
||||
id="path5" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-2"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M884.39,239.56v8.5h13.64v1.66c0,4.7,3.81,8.5,8.5,8.5h7.05v12.33c-18.47.87-36.26-7.04-47.98-21.35-2.57-3.13-2.57-7.64,0-10.78,11.72-14.3,29.51-22.22,47.98-21.35v12.33s-7.05,0-7.05,0c-4.7,0-8.5,3.81-8.5,8.5v1.66h-13.64Z"
|
||||
id="path6" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-3"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M862.35,353.71v8.5h-19.55c.23.4.49.78.79,1.14,11.71,14.3,29.49,22.21,47.95,21.35v-12.33h22.05v-10.16h-22.05v-8.5h22.05v-10.16h-22.05v-12.33c-18.46-.86-36.24,7.05-47.95,21.35-.29.36-.56.74-.79,1.14h19.55Z"
|
||||
id="path7" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-4"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M809.56,265.18c-15.69,0-28.41,12.72-28.41,28.41,0,15.69,12.72,28.41,28.41,28.41.64,6.27,3.69,12.04,8.51,16.09h18.04v-40.24h-18.47v-8.5h18.47v-40.24h-18.04c-4.82,4.05-7.88,9.82-8.51,16.09Z"
|
||||
id="path8" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-4"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M885.76,188.97v-15.55h1.66c4.98,0,8.5,3.52,8.5,8.5v7.05l6.06,1.21v6.24c0,7.07-8.48,12.06-20.47,12.06-11.99,0-20.47-5-20.47-12.06v-6.24l6.06-1.21v-7.05c0-4.98,3.52-8.5,8.5-8.5h1.66v15.55h8.5Z"
|
||||
id="path9" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-5"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M382.35,234.16h-8.5v-65.83c-1.86.92-3.64,1.84-5.27,2.97-4.56,3.16-8,7.97-10.37,13.1-5.56,12.01-5.26,25.74-3.94,38.97,1.22,12.16,3.31,23.9,6.59,35.4,2.07,7.28,4.62,14.47,7.43,21.54,1.76,4.41,3.61,8.78,5.78,14.23h48.86v-45.73h8.5v45.73h48.86c2.16-5.46,4.02-9.82,5.78-14.23,2.81-7.06,5.36-14.26,7.43-21.54,3.28-11.51,5.37-23.24,6.59-35.4,1.33-13.23,1.62-26.96-3.94-38.97-2.37-5.12-5.81-9.93-10.37-13.1-1.63-1.13-3.41-2.05-5.27-2.97v65.83h-8.5v-65.83c-28.79-14.31-60.86-14.31-89.65,0v65.83Z"
|
||||
id="path10" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-5"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M605.66,782.92c38.47-.62,69.15-32.3,68.53-70.77-.61-37.59-30.93-67.92-68.52-68.53h-30.01v73.17h-8.5v-73.17l-88.32.02c-37.8.66-68.58,30.58-70.31,68.35h-3.69v-29.17h-106.66v29.17h-3.69c-1.73-37.77-32.51-67.69-70.31-68.35l-88.32-.02v73.17h-8.5v-73.17h-30.01c-38.47.62-69.14,32.31-68.52,70.77.61,37.59,30.94,67.92,68.53,68.52h249.9v-58.64h8.5v58.64h249.9Z"
|
||||
id="path11" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-6"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M352.35,540.33c26-.03,47.78-19.7,50.44-45.57l165.2-16.61v69.59h8.5v-70.45l23.85-2.4c3.69-.37,7.41-.4,11.11-.08,26.21,2.23,49,18.89,59.06,43.2,14.88,35.92-2.18,77.1-38.1,91.97-5.42,2.25-11.15,3.69-16.99,4.27l-263.09,26.45-263.09-26.45c-5.84-.59-11.56-2.03-16.99-4.27-24.31-10.07-40.97-32.85-43.2-59.06-3.3-38.74,25.43-72.81,64.17-76.11,3.7-.31,7.42-.29,11.11.08l23.85,2.4v70.45h8.5v-69.59l165.2,16.61c2.66,25.87,24.44,45.54,50.44,45.57Z"
|
||||
id="path12" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-6"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M318.2,401.9v-.16"
|
||||
id="path13" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-7"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M465.08,342.74v8.5h145.46c-14.14,24.62-38.39,39.37-66.75,40.6.82,2.83,1.65,5.67,2.47,8.5,9.01-1.32,16.91,3.22,20.31,11.68s.85,17.19-6.56,22.49-16.51,4.87-23.4-1.09c-6.89-5.96-8.62-14.9-4.45-23-5.14-3.88-10.29-7.77-15.43-11.65-40.93,17.52-84,28.82-128.25,33.66-4.09.45-8.2.67-12.32.67h-106.47v8.5h48.53v.16c0,11.62-8.22,19.84-19.84,19.84h-87.33c0-24.15,0-48.29,0-72.44h-8.5v72.44h-18.27c-6.64,0-11.34-4.7-11.34-11.34v-1.61h-22.51c-1.97,0-3.93-.14-5.87-.41-42.31-5.9-75.76-32.47-91.09-72.34l-16.12.02c-2.29,0-4.4-.87-6.02-2.48s-2.49-3.73-2.5-6.01v-1.66c5.18,0,10.37-.01,15.55-.02v-8.5c-5.19,0-10.38.01-15.56.02v-1.66c0-4.98,3.51-8.51,8.49-8.51l16.12-.02c4.64-9.43,13.24-15.48,23.69-16.66,39.56,0,79.12-.02,118.67-.03l-2.35,16.71,8.42,1.18,2.52-17.9h6.31c7.13,15,14.26,30,21.39,45.01,26.35,0,52.7,0,79.05,0v20.47h8.5v-88.52c52.49,3.77,104.98,7.53,157.47,11.3,5.8-4.46,11.59-8.92,16.19-14.36,5.35-6.33,9.08-13.98,12.59-21.82,3.71-8.29,7.18-16.8,13.4-23.02,8.78-8.78,23.05-12.98,35.83-11.5,15.35,1.78,28.55,11.76,38.35,23.89,7.74,9.58,13.36,20.49,15.54,32.11,1.09,5.81,1.32,11.8,1.55,17.79,0,7,0,14.01,0,21.01h-145.46Z"
|
||||
id="path14" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-7"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M613.65,433.82v-1.21h70.44v-8.5h-70.44c2.07-17.04,16.73-29.72,33.88-29.32l102.15,20.61c3.29.66,6.12,2.75,7.72,5.7,2.99,5.5.96,12.39-4.54,15.38l-48.02,26.12,65.76,89.73,53.65,29.17c2.95,1.6,5.03,4.43,5.7,7.72,1.24,6.14-2.73,12.12-8.87,13.36l-102.15,20.61c-17.16.4-31.81-12.29-33.88-29.32h66.13v-8.5h-66.13v-1.21c0-4.09,2.91-7.6,6.92-8.36,12.27-2.38,24.02-6.92,34.7-13.4,5.46-3.36,7.16-10.5,3.8-15.96-.14-.23-.3-.46-.46-.69l-48.03-65.52c-15.04-19.86-36.92-33.42-61.39-38.04-4.02-.76-6.92-4.27-6.92-8.36Z"
|
||||
id="path15" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-8"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M500.14,52.8c3.58,8,9.08,15.91,16.86,20.82,10.22,6.45,24.39,7.71,36.57,5.13s23.28-9.58,30.24-19.41c4.89-6.91,8.01-15.27,10.49-23.58,1.05-3.54,1.99-7.06,2.93-10.58h8.5v36.19h18.95c0,23.38,0,46.76,0,70.14,0,6.64-4.7,11.34-11.34,11.34h-7.62v-51.84h-8.5v51.84h-100.09v-43.89h-8.5v43.89h-39.67c-4.35-.02-8.71-.04-13.05-.38-8.79-.69-17.55-2.69-25.76-5.94-12.12-4.8-23.07-12.33-32.73-21.19-9.03-8.28-16.93-17.73-21.67-29.3-2.52-6.16-4.15-12.92-2.58-19.33,1.12-4.59,3.87-8.99,7.83-11.44,1.75-1.08,3.73-1.79,5.97-2.21.87-.16,1.75-.25,2.63-.25,43.52,0,87.04,0,130.56,0"
|
||||
id="path16" />
|
||||
</g>
|
||||
<g
|
||||
id="LWPOLYLINE-8"
|
||||
data-name="LWPOLYLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M720.98,781.21h-1.21v-70.44h-8.5v70.44c-17.04-2.07-29.72-16.73-29.32-33.88l20.61-102.15c.66-3.29,2.75-6.12,5.7-7.72,5.5-2.99,12.39-.96,15.38,4.54l26.12,48.02,89.73-65.76,29.17-53.65c1.6-2.95,4.43-5.03,7.72-5.7,6.14-1.24,12.12,2.73,13.36,8.87l20.61,102.15c.4,17.16-12.29,31.81-29.32,33.88v-66.13h-8.5v66.13h-1.21c-4.09,0-7.6-2.91-8.36-6.92-2.38-12.27-6.92-24.02-13.4-34.7-3.36-5.46-10.5-7.16-15.96-3.8-.23.14-.46.3-.69.46l-65.52,48.03c-19.86,15.04-33.42,36.92-38.04,61.39-.76,4.02-4.27,6.92-8.36,6.92Z"
|
||||
id="path17" />
|
||||
</g>
|
||||
<g
|
||||
id="SPLINE-9"
|
||||
data-name="SPLINE">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M887.81,298.3v-15.55h1.66c4.98,0,8.5,3.52,8.5,8.5v7.05l6.06,1.21v6.24c0,7.07-8.48,12.06-20.47,12.06-11.99,0-20.47-5-20.47-12.06v-6.24l6.06-1.21v-7.05c0-4.98,3.52-8.5,8.5-8.5h1.66v15.55h8.5Z"
|
||||
id="path18" />
|
||||
</g>
|
||||
<g
|
||||
id="CIRCLE-4"
|
||||
data-name="CIRCLE">
|
||||
<circle
|
||||
class="cls-1"
|
||||
cx="830.02"
|
||||
cy="420.99"
|
||||
r="15.07"
|
||||
id="circle18" />
|
||||
</g>
|
||||
<g
|
||||
id="CIRCLE-5"
|
||||
data-name="CIRCLE">
|
||||
<circle
|
||||
class="cls-1"
|
||||
cx="830.02"
|
||||
cy="420.99"
|
||||
r="36.85"
|
||||
id="circle19" />
|
||||
</g>
|
||||
</g>
|
||||
<metadata
|
||||
id="metadata19">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<cc:license
|
||||
rdf:resource="http://creativecommons.org/licenses/by-nc/4.0/" />
|
||||
<dc:title>Free 3D Biplane Model SVG Files for Laser Cutting</dc:title>
|
||||
<dc:description>Get your free laser-cut SVG files for crafting an impressive wooden plane.</dc:description>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>templatesarea.com</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
<dc:publisher>
|
||||
<cc:Agent>
|
||||
<dc:title>templatesarea.com</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:publisher>
|
||||
<dc:rights>
|
||||
<cc:Agent>
|
||||
<dc:title>https://www.templatesarea.com/license-agreement/</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:rights>
|
||||
<dc:date>2025.03.17</dc:date>
|
||||
</cc:Work>
|
||||
<cc:License
|
||||
rdf:about="http://creativecommons.org/licenses/by-nc/4.0/">
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Reproduction" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#Distribution" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Notice" />
|
||||
<cc:requires
|
||||
rdf:resource="http://creativecommons.org/ns#Attribution" />
|
||||
<cc:prohibits
|
||||
rdf:resource="http://creativecommons.org/ns#CommercialUse" />
|
||||
<cc:permits
|
||||
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 14 KiB |
9080
examples/SVGView/svg/wooden-easter-egg-holder.svg
Normal file
9080
examples/SVGView/svg/wooden-easter-egg-holder.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 412 KiB |
|
|
@ -21,6 +21,13 @@ delete aarch and arm7 folders and .exe from bin
|
|||
|
||||
2022-03-05 CLANG-14
|
||||
2024-05-12 CLANG-18
|
||||
|
||||
|
||||
BUILDING start MSYS2 MINGW64
|
||||
|
||||
$ pacman -S --needed git wget mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake make mingw-w64-x86_64-python3 autoconf libtool
|
||||
|
||||
|
||||
------------------------------------------------------------------
|
||||
OpenSSL
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ Painter& Painter::Path(CParser& p)
|
|||
{
|
||||
Pointf current(0, 0);
|
||||
bool done = false;
|
||||
int previousCmd = 0;
|
||||
while(!p.IsEof()) {
|
||||
while(p.Char(','));
|
||||
int c = p.GetChar();
|
||||
p.Spaces();
|
||||
bool rel = IsLower(c);
|
||||
|
|
@ -23,13 +25,14 @@ Painter& Painter::Path(CParser& p)
|
|||
t += current;
|
||||
return t;
|
||||
};
|
||||
auto ReadPoint = [&]() { return ReadPointP(current, rel); };
|
||||
auto ReadPoint = [&] { return ReadPointP(current, rel); };
|
||||
auto IsDouble = [&] { while(p.Char(',')) {} return p.IsDouble2(); };
|
||||
switch(ToUpper(c)) {
|
||||
case 'M':
|
||||
current = ReadPoint();
|
||||
Move(current);
|
||||
case 'L':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
current = ReadPoint();
|
||||
Line(current);
|
||||
}
|
||||
|
|
@ -40,21 +43,21 @@ Painter& Painter::Path(CParser& p)
|
|||
done = true;
|
||||
break;
|
||||
case 'H':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
current.x = p.ReadDouble() + rel * current.x;
|
||||
Line(current);
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
case 'V':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
current.y = p.ReadDouble() + rel * current.y;
|
||||
Line(current);
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
case 'C':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
t1 = ReadPoint();
|
||||
t2 = ReadPoint();
|
||||
current = ReadPoint();
|
||||
|
|
@ -63,15 +66,20 @@ Painter& Painter::Path(CParser& p)
|
|||
}
|
||||
break;
|
||||
case 'S':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
Pointf now = current;
|
||||
t2 = ReadPoint();
|
||||
current = ReadPoint();
|
||||
Cubic(t2, current);
|
||||
if(previousCmd != 'C' && previousCmd != 'S')
|
||||
Cubic(now, t2, current);
|
||||
else
|
||||
Cubic(t2, current);
|
||||
while(p.Char(','));
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
case 'Q':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
t1 = ReadPoint();
|
||||
current = ReadPoint();
|
||||
Quadratic(t1, current);
|
||||
|
|
@ -79,14 +87,18 @@ Painter& Painter::Path(CParser& p)
|
|||
}
|
||||
break;
|
||||
case 'T':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
Pointf now = current;
|
||||
current = ReadPoint();
|
||||
Quadratic(current);
|
||||
if(previousCmd != 'Q' && previousCmd != 'T')
|
||||
Quadratic(now, current);
|
||||
else
|
||||
Quadratic(current);
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
case 'A':
|
||||
while(p.IsDouble2()) {
|
||||
while(IsDouble()) {
|
||||
t1 = ReadPointP(Pointf(0, 0), false);
|
||||
double xangle = ReadDouble();
|
||||
auto ReadBool = [&] {
|
||||
|
|
@ -107,6 +119,8 @@ Painter& Painter::Path(CParser& p)
|
|||
Move(0, 0); // to clear previous path
|
||||
return *this;
|
||||
}
|
||||
|
||||
previousCmd = ToUpper(c);
|
||||
}
|
||||
if(!done)
|
||||
Move(0, 0); // to clear previous path
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ struct SvgParser {
|
|||
void Items(const XmlNode& n, int depth);
|
||||
void Element(const XmlNode& n, int depth, bool dosymbols = false);
|
||||
void ParseGradient(const XmlNode& n, bool radial);
|
||||
void ParseStyle(const XmlNode& n);
|
||||
void ResolveGradient(int i);
|
||||
void MapIds(const XmlNode& n);
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ void SvgParser::DoGradient(int gi, bool stroke)
|
|||
r = r / sz;
|
||||
}
|
||||
Xform2D m;
|
||||
|
||||
|
||||
if(g.radial) {
|
||||
m.x.x = r.x;
|
||||
m.x.y = 0;
|
||||
|
|
@ -238,6 +238,38 @@ void SvgParser::ParseGradient(const XmlNode& n, bool radial)
|
|||
s.offset = Nvl(StrDbl(m.Attr("offset")), offset);
|
||||
}
|
||||
}
|
||||
void SvgParser::ParseStyle(const XmlNode& n)
|
||||
{
|
||||
String text = n.GatherText();
|
||||
try {
|
||||
CParser p(text);
|
||||
while(!p.IsEof()) {
|
||||
if(p.Char('.') && p.IsId()) {
|
||||
Vector<String> ids;
|
||||
String id = p.ReadIdh();
|
||||
ids.Add(id);
|
||||
while(p.Char(',') && p.Char('.') && p.IsId()) {
|
||||
id = p.ReadIdh();
|
||||
ids.Add(id);
|
||||
}
|
||||
|
||||
if(p.Char('{')) {
|
||||
const char *b = p.GetPtr();
|
||||
while(!p.IsChar('}') && !p.IsEof())
|
||||
p.SkipTerm();
|
||||
|
||||
String style(b, p.GetPtr());
|
||||
for(const String& id : ids)
|
||||
classes.GetAdd(id) << style;
|
||||
}
|
||||
p.Char('}');
|
||||
}
|
||||
else
|
||||
p.SkipTerm();
|
||||
}
|
||||
}
|
||||
catch(CParser::Error) {}
|
||||
}
|
||||
|
||||
void SvgParser::Poly(const XmlNode& n, bool line)
|
||||
{
|
||||
|
|
@ -356,6 +388,9 @@ void SvgParser::Element(const XmlNode& n, int depth, bool dosymbols)
|
|||
else
|
||||
if(m.IsTag("radialGradient"))
|
||||
ParseGradient(m, true);
|
||||
else
|
||||
if(m.IsTag("style"))
|
||||
ParseStyle(m);
|
||||
}
|
||||
else
|
||||
if(n.IsTag("linearGradient"))
|
||||
|
|
@ -482,27 +517,8 @@ void SvgParser::Element(const XmlNode& n, int depth, bool dosymbols)
|
|||
}
|
||||
}
|
||||
else
|
||||
if(n.IsTag("style")) {
|
||||
String text = n.GatherText();
|
||||
try {
|
||||
CParser p(text);
|
||||
while(!p.IsEof()) {
|
||||
if(p.Char('.') && p.IsId()) {
|
||||
String id = p.ReadId();
|
||||
if(p.Char('{')) {
|
||||
const char *b = p.GetPtr();
|
||||
while(!p.IsChar('}') && !p.IsEof())
|
||||
p.SkipTerm();
|
||||
classes.Add(id, String(b, p.GetPtr()));
|
||||
}
|
||||
p.Char('}');
|
||||
}
|
||||
else
|
||||
p.SkipTerm();
|
||||
}
|
||||
}
|
||||
catch(CParser::Error) {}
|
||||
}
|
||||
if(n.IsTag("style"))
|
||||
ParseStyle(n);
|
||||
}
|
||||
|
||||
void SvgParser::Items(const XmlNode& n, int depth)
|
||||
|
|
@ -633,4 +649,4 @@ Rectf GetSVGPathBoundingBox(const char *path)
|
|||
return p.Get();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -139,7 +139,11 @@ bool Clang::Parse(const String& filename_, const String& content,
|
|||
|
||||
String cmdline0 = cmdline;
|
||||
|
||||
cmdline << RedefineMacros() << " ";
|
||||
#ifdef PLATFORM_WIN32
|
||||
cmdline << " --target=x86_64-w64-windows-gnu -Dlint -Dassist_parser__ ";
|
||||
#else
|
||||
cmdline << " -Dassist_parser__ ";
|
||||
#endif
|
||||
|
||||
args.Append(Split(cmdline, ' '));
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ struct SourceLocation : Moveable<SourceLocation> {
|
|||
String ToString() const { return path + ": " + AsString(pos); }
|
||||
};
|
||||
|
||||
String RedefineMacros();
|
||||
String GetClangInternalIncludes();
|
||||
|
||||
enum AdditionalKinds {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ file
|
|||
clang.dli,
|
||||
libclang.cpp,
|
||||
util.cpp,
|
||||
macros.cpp,
|
||||
clang.cpp,
|
||||
Visitor.cpp,
|
||||
CurrentFile.cpp,
|
||||
|
|
|
|||
|
|
@ -1,454 +0,0 @@
|
|||
#include "clang.h"
|
||||
|
||||
// we are using libclang.dll for MSVC and therefore need to redefine standard macros
|
||||
// to mingw clang
|
||||
|
||||
//#BLITZ_PROHIBIT
|
||||
|
||||
#ifdef PLATFORM_WIN32
|
||||
const char umacros[] =
|
||||
R"(#define CHECK_GRID(g)
|
||||
#define CHECK_MATRIX(g)
|
||||
#define CHECK_NUMBER(g)
|
||||
#define _CPPRTTI 1
|
||||
#define _CPPUNWIND 1
|
||||
#define _HAS_CHAR16_T_LANGUAGE_SUPPORT 1
|
||||
#define _INTEGRAL_MAX_BITS 64
|
||||
#define _MSC_BUILD 1
|
||||
#define _MSC_EXTENSIONS 1
|
||||
#define _MSC_FULL_VER 192328106
|
||||
#define _MSC_VER 1923
|
||||
#define _MSVC_EXECUTION_CHARACTER_SET 65001
|
||||
#define _MSVC_LANG 201402L
|
||||
#define _M_AMD64 100
|
||||
#define _M_X64 100
|
||||
#define _NATIVE_NULLPTR_SUPPORTED 1
|
||||
#define _NATIVE_WCHAR_T_DEFINED 1
|
||||
#define _RVALUE_REFERENCES_SUPPORTED 1
|
||||
#define _RVALUE_REFERENCES_V2_SUPPORTED 1
|
||||
#define _WCHAR_T_DEFINED 1
|
||||
#define _WIN32 1
|
||||
#define _WIN64 1
|
||||
#define __ATOMIC_ACQUIRE 2
|
||||
#define __ATOMIC_ACQ_REL 4
|
||||
#define __ATOMIC_CONSUME 1
|
||||
#define __ATOMIC_RELAXED 0
|
||||
#define __ATOMIC_RELEASE 3
|
||||
#define __ATOMIC_SEQ_CST 5
|
||||
#define __BIGGEST_ALIGNMENT__ 16
|
||||
#define __BITINT_MAXWIDTH__ 128
|
||||
#define __BOOL_DEFINED 1
|
||||
#define __BOOL_WIDTH__ 8
|
||||
#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
|
||||
#define __CHAR16_TYPE__ unsigned short
|
||||
#define __CHAR32_TYPE__ unsigned int
|
||||
#define __CHAR_BIT__ 8
|
||||
#define __CLANG_ATOMIC_BOOL_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_CHAR16_T_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_CHAR32_T_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_CHAR_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_INT_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_LLONG_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_LONG_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_POINTER_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_SHORT_LOCK_FREE 2
|
||||
#define __CLANG_ATOMIC_WCHAR_T_LOCK_FREE 2
|
||||
#define __CONSTANT_CFSTRINGS__ 1
|
||||
#define __DBL_DECIMAL_DIG__ 17
|
||||
#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
|
||||
#define __DBL_DIG__ 15
|
||||
#define __DBL_EPSILON__ 2.2204460492503131e-16
|
||||
#define __DBL_HAS_DENORM__ 1
|
||||
#define __DBL_HAS_INFINITY__ 1
|
||||
#define __DBL_HAS_QUIET_NAN__ 1
|
||||
#define __DBL_MANT_DIG__ 53
|
||||
#define __DBL_MAX_10_EXP__ 308
|
||||
#define __DBL_MAX_EXP__ 1024
|
||||
#define __DBL_MAX__ 1.7976931348623157e+308
|
||||
#define __DBL_MIN_10_EXP__ (-307)
|
||||
#define __DBL_MIN_EXP__ (-1021)
|
||||
#define __DBL_MIN__ 2.2250738585072014e-308
|
||||
#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
|
||||
#define __DEPRECATED 1
|
||||
#define __FINITE_MATH_ONLY__ 0
|
||||
#define __FLT_DECIMAL_DIG__ 9
|
||||
#define __FLT_DENORM_MIN__ 1.40129846e-45F
|
||||
#define __FLT_DIG__ 6
|
||||
#define __FLT_EPSILON__ 1.19209290e-7F
|
||||
#define __FLT_EVAL_METHOD__ 0
|
||||
#define __FLT_HAS_DENORM__ 1
|
||||
#define __FLT_HAS_INFINITY__ 1
|
||||
#define __FLT_HAS_QUIET_NAN__ 1
|
||||
#define __FLT_MANT_DIG__ 24
|
||||
#define __FLT_MAX_10_EXP__ 38
|
||||
#define __FLT_MAX_EXP__ 128
|
||||
#define __FLT_MAX__ 3.40282347e+38F
|
||||
#define __FLT_MIN_10_EXP__ (-37)
|
||||
#define __FLT_MIN_EXP__ (-125)
|
||||
#define __FLT_MIN__ 1.17549435e-38F
|
||||
#define __FLT_RADIX__ 2
|
||||
#define __FXSR__ 1
|
||||
#define __GCC_ASM_FLAG_OUTPUTS__ 1
|
||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
|
||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
|
||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
|
||||
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
|
||||
#define __INT16_C_SUFFIX__
|
||||
#define __INT16_FMTd__ "hd"
|
||||
#define __INT16_FMTi__ "hi"
|
||||
#define __INT16_MAX__ 32767
|
||||
#define __INT16_TYPE__ short
|
||||
#define __INT32_C_SUFFIX__
|
||||
#define __INT32_FMTd__ "d"
|
||||
#define __INT32_FMTi__ "i"
|
||||
#define __INT32_MAX__ 2147483647
|
||||
#define __INT32_TYPE__ int
|
||||
#define __INT64_C_SUFFIX__ LL
|
||||
#define __INT64_FMTd__ "lld"
|
||||
#define __INT64_FMTi__ "lli"
|
||||
#define __INT64_MAX__ 9223372036854775807LL
|
||||
#define __INT64_TYPE__ long long int
|
||||
#define __INT8_C_SUFFIX__
|
||||
#define __INT8_FMTd__ "hhd"
|
||||
#define __INT8_FMTi__ "hhi"
|
||||
#define __INT8_MAX__ 127
|
||||
#define __INT8_TYPE__ signed char
|
||||
#define __INTMAX_C_SUFFIX__ LL
|
||||
#define __INTMAX_FMTd__ "lld"
|
||||
#define __INTMAX_FMTi__ "lli"
|
||||
#define __INTMAX_MAX__ 9223372036854775807LL
|
||||
#define __INTMAX_TYPE__ long long int
|
||||
#define __INTMAX_WIDTH__ 64
|
||||
#define __INTPTR_FMTd__ "lld"
|
||||
#define __INTPTR_FMTi__ "lli"
|
||||
#define __INTPTR_MAX__ 9223372036854775807LL
|
||||
#define __INTPTR_TYPE__ long long int
|
||||
#define __INTPTR_WIDTH__ 64
|
||||
#define __INT_FAST16_FMTd__ "hd"
|
||||
#define __INT_FAST16_FMTi__ "hi"
|
||||
#define __INT_FAST16_MAX__ 32767
|
||||
#define __INT_FAST16_TYPE__ short
|
||||
#define __INT_FAST16_WIDTH__ 16
|
||||
#define __INT_FAST32_FMTd__ "d"
|
||||
#define __INT_FAST32_FMTi__ "i"
|
||||
#define __INT_FAST32_MAX__ 2147483647
|
||||
#define __INT_FAST32_TYPE__ int
|
||||
#define __INT_FAST32_WIDTH__ 32
|
||||
#define __INT_FAST64_FMTd__ "lld"
|
||||
#define __INT_FAST64_FMTi__ "lli"
|
||||
#define __INT_FAST64_MAX__ 9223372036854775807LL
|
||||
#define __INT_FAST64_TYPE__ long long int
|
||||
#define __INT_FAST64_WIDTH__ 64
|
||||
#define __INT_FAST8_FMTd__ "hhd"
|
||||
#define __INT_FAST8_FMTi__ "hhi"
|
||||
#define __INT_FAST8_MAX__ 127
|
||||
#define __INT_FAST8_TYPE__ signed char
|
||||
#define __INT_FAST8_WIDTH__ 8
|
||||
#define __INT_LEAST16_FMTd__ "hd"
|
||||
#define __INT_LEAST16_FMTi__ "hi"
|
||||
#define __INT_LEAST16_MAX__ 32767
|
||||
#define __INT_LEAST16_TYPE__ short
|
||||
#define __INT_LEAST16_WIDTH__ 16
|
||||
#define __INT_LEAST32_FMTd__ "d"
|
||||
#define __INT_LEAST32_FMTi__ "i"
|
||||
#define __INT_LEAST32_MAX__ 2147483647
|
||||
#define __INT_LEAST32_TYPE__ int
|
||||
#define __INT_LEAST32_WIDTH__ 32
|
||||
#define __INT_LEAST64_FMTd__ "lld"
|
||||
#define __INT_LEAST64_FMTi__ "lli"
|
||||
#define __INT_LEAST64_MAX__ 9223372036854775807LL
|
||||
#define __INT_LEAST64_TYPE__ long long int
|
||||
#define __INT_LEAST64_WIDTH__ 64
|
||||
#define __INT_LEAST8_FMTd__ "hhd"
|
||||
#define __INT_LEAST8_FMTi__ "hhi"
|
||||
#define __INT_LEAST8_MAX__ 127
|
||||
#define __INT_LEAST8_TYPE__ signed char
|
||||
#define __INT_LEAST8_WIDTH__ 8
|
||||
#define __INT_MAX__ 2147483647
|
||||
#define __INT_WIDTH__ 32
|
||||
#define __LDBL_DECIMAL_DIG__ 17
|
||||
#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L
|
||||
#define __LDBL_DIG__ 15
|
||||
#define __LDBL_EPSILON__ 2.2204460492503131e-16L
|
||||
#define __LDBL_HAS_DENORM__ 1
|
||||
#define __LDBL_HAS_INFINITY__ 1
|
||||
#define __LDBL_HAS_QUIET_NAN__ 1
|
||||
#define __LDBL_MANT_DIG__ 53
|
||||
#define __LDBL_MAX_10_EXP__ 308
|
||||
#define __LDBL_MAX_EXP__ 1024
|
||||
#define __LDBL_MAX__ 1.7976931348623157e+308L
|
||||
#define __LDBL_MIN_10_EXP__ (-307)
|
||||
#define __LDBL_MIN_EXP__ (-1021)
|
||||
#define __LDBL_MIN__ 2.2250738585072014e-308L
|
||||
#define __LITTLE_ENDIAN__ 1
|
||||
#define __LLONG_WIDTH__ 64
|
||||
#define __LONG_LONG_MAX__ 9223372036854775807LL
|
||||
#define __LONG_MAX__ 2147483647L
|
||||
#define __LONG_WIDTH__ 32
|
||||
#define __MMX__ 1
|
||||
#define __NO_INLINE__ 1
|
||||
#define __NO_MATH_INLINES 1
|
||||
#define __OBJC_BOOL_IS_BOOL 0
|
||||
#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3
|
||||
#define __OPENCL_MEMORY_SCOPE_DEVICE 2
|
||||
#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
|
||||
#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
|
||||
#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
|
||||
#define __ORDER_BIG_ENDIAN__ 4321
|
||||
#define __ORDER_LITTLE_ENDIAN__ 1234
|
||||
#define __ORDER_PDP_ENDIAN__ 3412
|
||||
#define __PIC__ 2
|
||||
#define __POINTER_WIDTH__ 64
|
||||
#define __PRAGMA_REDEFINE_EXTNAME 1
|
||||
#define __PTRDIFF_FMTd__ "lld"
|
||||
#define __PTRDIFF_FMTi__ "lli"
|
||||
#define __PTRDIFF_MAX__ 9223372036854775807LL
|
||||
#define __PTRDIFF_TYPE__ long long int
|
||||
#define __PTRDIFF_WIDTH__ 64
|
||||
#define __REGISTER_PREFIX__
|
||||
#define __SCHAR_MAX__ 127
|
||||
#define __SEG_FS 1
|
||||
#define __SEG_GS 1
|
||||
#define __SHRT_MAX__ 32767
|
||||
#define __SHRT_WIDTH__ 16
|
||||
#define __SIG_ATOMIC_MAX__ 2147483647
|
||||
#define __SIG_ATOMIC_WIDTH__ 32
|
||||
#define __SIZEOF_DOUBLE__ 8
|
||||
#define __SIZEOF_FLOAT__ 4
|
||||
#define __SIZEOF_INT128__ 16
|
||||
#define __SIZEOF_INT__ 4
|
||||
#define __SIZEOF_LONG_DOUBLE__ 8
|
||||
#define __SIZEOF_LONG_LONG__ 8
|
||||
#define __SIZEOF_LONG__ 4
|
||||
#define __SIZEOF_POINTER__ 8
|
||||
#define __SIZEOF_PTRDIFF_T__ 8
|
||||
#define __SIZEOF_SHORT__ 2
|
||||
#define __SIZEOF_SIZE_T__ 8
|
||||
#define __SIZEOF_WCHAR_T__ 2
|
||||
#define __SIZEOF_WINT_T__ 2
|
||||
#define __SIZE_FMTX__ "llX"
|
||||
#define __SIZE_FMTo__ "llo"
|
||||
#define __SIZE_FMTu__ "llu"
|
||||
#define __SIZE_FMTx__ "llx"
|
||||
#define __SIZE_MAX__ 18446744073709551615ULL
|
||||
#define __SIZE_TYPE__ long long unsigned int
|
||||
#define __SIZE_WIDTH__ 64
|
||||
#define __SSE2_MATH__ 1
|
||||
#define __SSE2__ 1
|
||||
#define __SSE_MATH__ 1
|
||||
#define __SSE__ 1
|
||||
#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16ULL
|
||||
#define __STDCPP_THREADS__ 1
|
||||
#define __STDC_HOSTED__ 1
|
||||
#define __STDC_NO_THREADS__ 1
|
||||
#define __STDC_UTF_16__ 1
|
||||
#define __STDC_UTF_32__ 1
|
||||
#define __UINT16_C_SUFFIX__
|
||||
#define __UINT16_FMTX__ "hX"
|
||||
#define __UINT16_FMTo__ "ho"
|
||||
#define __UINT16_FMTu__ "hu"
|
||||
#define __UINT16_FMTx__ "hx"
|
||||
#define __UINT16_MAX__ 65535
|
||||
#define __UINT16_TYPE__ unsigned short
|
||||
#define __UINT32_C_SUFFIX__ U
|
||||
#define __UINT32_FMTX__ "X"
|
||||
#define __UINT32_FMTo__ "o"
|
||||
#define __UINT32_FMTu__ "u"
|
||||
#define __UINT32_FMTx__ "x"
|
||||
#define __UINT32_MAX__ 4294967295U
|
||||
#define __UINT32_TYPE__ unsigned int
|
||||
#define __UINT64_C_SUFFIX__ ULL
|
||||
#define __UINT64_FMTX__ "llX"
|
||||
#define __UINT64_FMTo__ "llo"
|
||||
#define __UINT64_FMTu__ "llu"
|
||||
#define __UINT64_FMTx__ "llx"
|
||||
#define __UINT64_MAX__ 18446744073709551615ULL
|
||||
#define __UINT64_TYPE__ long long unsigned int
|
||||
#define __UINT8_C_SUFFIX__
|
||||
#define __UINT8_FMTX__ "hhX"
|
||||
#define __UINT8_FMTo__ "hho"
|
||||
#define __UINT8_FMTu__ "hhu"
|
||||
#define __UINT8_FMTx__ "hhx"
|
||||
#define __UINT8_MAX__ 255
|
||||
#define __UINT8_TYPE__ unsigned char
|
||||
#define __UINTMAX_C_SUFFIX__ ULL
|
||||
#define __UINTMAX_FMTX__ "llX"
|
||||
#define __UINTMAX_FMTo__ "llo"
|
||||
#define __UINTMAX_FMTu__ "llu"
|
||||
#define __UINTMAX_FMTx__ "llx"
|
||||
#define __UINTMAX_MAX__ 18446744073709551615ULL
|
||||
#define __UINTMAX_TYPE__ long long unsigned int
|
||||
#define __UINTMAX_WIDTH__ 64
|
||||
#define __UINTPTR_FMTX__ "llX"
|
||||
#define __UINTPTR_FMTo__ "llo"
|
||||
#define __UINTPTR_FMTu__ "llu"
|
||||
#define __UINTPTR_FMTx__ "llx"
|
||||
#define __UINTPTR_MAX__ 18446744073709551615ULL
|
||||
#define __UINTPTR_TYPE__ long long unsigned int
|
||||
#define __UINTPTR_WIDTH__ 64
|
||||
#define __UINT_FAST16_FMTX__ "hX"
|
||||
#define __UINT_FAST16_FMTo__ "ho"
|
||||
#define __UINT_FAST16_FMTu__ "hu"
|
||||
#define __UINT_FAST16_FMTx__ "hx"
|
||||
#define __UINT_FAST16_MAX__ 65535
|
||||
#define __UINT_FAST16_TYPE__ unsigned short
|
||||
#define __UINT_FAST32_FMTX__ "X"
|
||||
#define __UINT_FAST32_FMTo__ "o"
|
||||
#define __UINT_FAST32_FMTu__ "u"
|
||||
#define __UINT_FAST32_FMTx__ "x"
|
||||
#define __UINT_FAST32_MAX__ 4294967295U
|
||||
#define __UINT_FAST32_TYPE__ unsigned int
|
||||
#define __UINT_FAST64_FMTX__ "llX"
|
||||
#define __UINT_FAST64_FMTo__ "llo"
|
||||
#define __UINT_FAST64_FMTu__ "llu"
|
||||
#define __UINT_FAST64_FMTx__ "llx"
|
||||
#define __UINT_FAST64_MAX__ 18446744073709551615ULL
|
||||
#define __UINT_FAST64_TYPE__ long long unsigned int
|
||||
#define __UINT_FAST8_FMTX__ "hhX"
|
||||
#define __UINT_FAST8_FMTo__ "hho"
|
||||
#define __UINT_FAST8_FMTu__ "hhu"
|
||||
#define __UINT_FAST8_FMTx__ "hhx"
|
||||
#define __UINT_FAST8_MAX__ 255
|
||||
#define __UINT_FAST8_TYPE__ unsigned char
|
||||
#define __UINT_LEAST16_FMTX__ "hX"
|
||||
#define __UINT_LEAST16_FMTo__ "ho"
|
||||
#define __UINT_LEAST16_FMTu__ "hu"
|
||||
#define __UINT_LEAST16_FMTx__ "hx"
|
||||
#define __UINT_LEAST16_MAX__ 65535
|
||||
#define __UINT_LEAST16_TYPE__ unsigned short
|
||||
#define __UINT_LEAST32_FMTX__ "X"
|
||||
#define __UINT_LEAST32_FMTo__ "o"
|
||||
#define __UINT_LEAST32_FMTu__ "u"
|
||||
#define __UINT_LEAST32_FMTx__ "x"
|
||||
#define __UINT_LEAST32_MAX__ 4294967295U
|
||||
#define __UINT_LEAST32_TYPE__ unsigned int
|
||||
#define __UINT_LEAST64_FMTX__ "llX"
|
||||
#define __UINT_LEAST64_FMTo__ "llo"
|
||||
#define __UINT_LEAST64_FMTu__ "llu"
|
||||
#define __UINT_LEAST64_FMTx__ "llx"
|
||||
#define __UINT_LEAST64_MAX__ 18446744073709551615ULL
|
||||
#define __UINT_LEAST64_TYPE__ long long unsigned int
|
||||
#define __UINT_LEAST8_FMTX__ "hhX"
|
||||
#define __UINT_LEAST8_FMTo__ "hho"
|
||||
#define __UINT_LEAST8_FMTu__ "hhu"
|
||||
#define __UINT_LEAST8_FMTx__ "hhx"
|
||||
#define __UINT_LEAST8_MAX__ 255
|
||||
#define __UINT_LEAST8_TYPE__ unsigned char
|
||||
#define __USER_LABEL_PREFIX__
|
||||
#define __VERSION__ "Clang 14.0.0"
|
||||
#define __WCHAR_MAX__ 65535
|
||||
#define __WCHAR_TYPE__ unsigned short
|
||||
#define __WCHAR_UNSIGNED__ 1
|
||||
#define __WCHAR_WIDTH__ 16
|
||||
#define __WINT_MAX__ 65535
|
||||
#define __WINT_TYPE__ unsigned short
|
||||
#define __WINT_UNSIGNED__ 1
|
||||
#define __WINT_WIDTH__ 16
|
||||
#define __amd64 1
|
||||
#define __amd64__ 1
|
||||
#define __clang__ 1
|
||||
#define __clang_literal_encoding__ "UTF-8"
|
||||
#define __clang_major__ 14
|
||||
#define __clang_minor__ 0
|
||||
#define __clang_patchlevel__ 0
|
||||
#define __clang_version__ "14.0.0 "
|
||||
#define __clang_wide_literal_encoding__ "UTF-16"
|
||||
#define __code_model_small__ 1
|
||||
#define __cplusplus 201402L
|
||||
#define __cpp_aggregate_nsdmi 201304L
|
||||
#define __cpp_alias_templates 200704L
|
||||
#define __cpp_attributes 200809L
|
||||
#define __cpp_binary_literals 201304L
|
||||
#define __cpp_constexpr 201304L
|
||||
#define __cpp_constexpr_in_decltype 201711L
|
||||
#define __cpp_decltype 200707L
|
||||
#define __cpp_decltype_auto 201304L
|
||||
#define __cpp_delegating_constructors 200604L
|
||||
#define __cpp_digit_separators 201309L
|
||||
#define __cpp_exceptions 199711L
|
||||
#define __cpp_generic_lambdas 201304L
|
||||
#define __cpp_impl_destroying_delete 201806L
|
||||
#define __cpp_inheriting_constructors 201511L
|
||||
#define __cpp_init_captures 201304L
|
||||
#define __cpp_initializer_lists 200806L
|
||||
#define __cpp_lambdas 200907L
|
||||
#define __cpp_nsdmi 200809L
|
||||
#define __cpp_range_based_for 200907
|
||||
#define __cpp_raw_strings 200710L
|
||||
#define __cpp_ref_qualifiers 200710L
|
||||
#define __cpp_return_type_deduction 201304L
|
||||
#define __cpp_rtti 199711L
|
||||
#define __cpp_rvalue_references 200610L
|
||||
#define __cpp_static_assert 200410
|
||||
#define __cpp_threadsafe_static_init 200806L
|
||||
#define __cpp_unicode_characters 200704L
|
||||
#define __cpp_unicode_literals 200710L
|
||||
#define __cpp_user_defined_literals 200809L
|
||||
#define __cpp_variable_templates 201304L
|
||||
#define __cpp_variadic_templates 200704L
|
||||
#define __k8 1
|
||||
#define __k8__ 1
|
||||
#define __llvm__ 1
|
||||
#define __pic__ 2
|
||||
#define __seg_fs __attribute__((address_space(257)))
|
||||
#define __seg_gs __attribute__((address_space(256)))
|
||||
#define __tune_k8__ 1
|
||||
#define __x86_64 1
|
||||
#define __x86_64__ 1
|
||||
)";
|
||||
#endif
|
||||
|
||||
String RedefineMacros()
|
||||
{
|
||||
#ifdef PLATFORM_WIN32
|
||||
INTERLOCKED {
|
||||
static String cmdline;
|
||||
static int cpp_version = 0;
|
||||
|
||||
if(cpp_version != LibClangCppVersion) {
|
||||
cpp_version = LibClangCppVersion;
|
||||
VectorMap<String, String> um, dm;
|
||||
auto Parse = [&](const char *s) {
|
||||
VectorMap<String, String> r;
|
||||
StringStream ss(s);
|
||||
while(!ss.IsEof()) {
|
||||
String line = ss.GetLine();
|
||||
if(line.TrimStart("#define ") && line.Find('\"') < 0) {
|
||||
int q = line.Find(' ');
|
||||
r.GetAdd(TrimBoth(line.Mid(0, q))) = TrimBoth(line.Mid(q + 1));
|
||||
}
|
||||
}
|
||||
return r;
|
||||
};
|
||||
|
||||
um = Parse(umacros);
|
||||
|
||||
String dummy = ConfigFile("dummy.cpp");
|
||||
Upp::SaveFile(dummy, String());
|
||||
String dmacros = Sys(GetExeDirFile("bin/clang/bin/c++") +
|
||||
" -v -std=c++" + AsString(cpp_version) + " -xc++ -dM -E " + dummy);
|
||||
|
||||
dm = Parse(dmacros);
|
||||
|
||||
for(const auto& h : ~um) {
|
||||
int q = dm.Find(h.key);
|
||||
if(q < 0)
|
||||
cmdline << " -U" << h.key;
|
||||
else
|
||||
if(dm[q] != h.value)
|
||||
cmdline << " -U" << h.key << " -D" << h.key << "=" << dm[q];
|
||||
}
|
||||
for(const auto& h : ~dm)
|
||||
if(um.Find(h.key) < 0)
|
||||
cmdline << " -D" << h.key << "=" << h.value;
|
||||
}
|
||||
|
||||
cmdline << " -Dlint";
|
||||
|
||||
cmdline << " -Dassist_parser__";
|
||||
|
||||
return cmdline;
|
||||
}
|
||||
#endif
|
||||
return " -Dassist_parser__";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue