From de1da82e5c539642602b414242bbfeaec066f5cf Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Tue, 23 Sep 2025 16:44:08 +0200 Subject: [PATCH 1/4] Painter: Fixed problems with style and path (thanks zouql) --- examples/SVGView/SVGView.upp | 1 + examples/SVGView/main.cpp | 2 +- examples/SVGView/svg/biplane.svg | 298 +++++++++++++++++++++++++++++++ uppsrc/Painter/PainterPath.cpp | 36 ++-- uppsrc/Painter/SvgParser.cpp | 27 ++- 5 files changed, 349 insertions(+), 15 deletions(-) create mode 100644 examples/SVGView/svg/biplane.svg diff --git a/examples/SVGView/SVGView.upp b/examples/SVGView/SVGView.upp index 14006e534..003a1f557 100644 --- a/examples/SVGView/SVGView.upp +++ b/examples/SVGView/SVGView.upp @@ -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, diff --git a/examples/SVGView/main.cpp b/examples/SVGView/main.cpp index e95dc5030..74ae77941 100644 --- a/examples/SVGView/main.cpp +++ b/examples/SVGView/main.cpp @@ -121,7 +121,7 @@ SvgView::SvgView() Sizeable().Zoomable(); - AddFrame(splitter.Left(files, 200)); + AddFrame(splitter.Left(files, DPI(200))); dir = GetDataFile("svg"); } diff --git a/examples/SVGView/svg/biplane.svg b/examples/SVGView/svg/biplane.svg new file mode 100644 index 000000000..5b43e8839 --- /dev/null +++ b/examples/SVGView/svg/biplane.svg @@ -0,0 +1,298 @@ + + + Free 3D Biplane Model SVG Files for Laser Cutting + + + + + + + templatesarea.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Free 3D Biplane Model SVG Files for Laser Cutting + Get your free laser-cut SVG files for crafting an impressive wooden plane. + + + templatesarea.com + + + + + templatesarea.com + + + + + https://www.templatesarea.com/license-agreement/ + + + 2025.03.17 + + + + + + + + + + + + diff --git a/uppsrc/Painter/PainterPath.cpp b/uppsrc/Painter/PainterPath.cpp index c8d4d32ff..73a7b9915 100644 --- a/uppsrc/Painter/PainterPath.cpp +++ b/uppsrc/Painter/PainterPath.cpp @@ -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 diff --git a/uppsrc/Painter/SvgParser.cpp b/uppsrc/Painter/SvgParser.cpp index d1353a640..9ef38df37 100644 --- a/uppsrc/Painter/SvgParser.cpp +++ b/uppsrc/Painter/SvgParser.cpp @@ -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; @@ -356,6 +356,27 @@ void SvgParser::Element(const XmlNode& n, int depth, bool dosymbols) else if(m.IsTag("radialGradient")) ParseGradient(m, true); + else if(m.IsTag("style")) { + String text = m.GatherText(); + try { + CParser p(text); + while(!p.IsEof()) { + if(p.Char('.') && p.IsId()) { + String id = p.ReadIdh(); + 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) {} + } } else if(n.IsTag("linearGradient")) @@ -488,7 +509,7 @@ void SvgParser::Element(const XmlNode& n, int depth, bool dosymbols) CParser p(text); while(!p.IsEof()) { if(p.Char('.') && p.IsId()) { - String id = p.ReadId(); + String id = p.ReadIdh(); if(p.Char('{')) { const char *b = p.GetPtr(); while(!p.IsChar('}') && !p.IsEof()) @@ -633,4 +654,4 @@ Rectf GetSVGPathBoundingBox(const char *path) return p.Get(); } -} +} \ No newline at end of file From 14bbbe92f85c5ce601907e88cb7375fece15c02c Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Wed, 24 Sep 2025 09:09:01 +0200 Subject: [PATCH 2/4] Painter: Another SVG fix --- examples/SVGView/SVGView.upp | 1 + .../SVGView/svg/wooden-easter-egg-holder.svg | 9080 +++++++++++++++++ uppsrc/Painter/SvgInternal.h | 1 + uppsrc/Painter/SvgParser.cpp | 79 +- 4 files changed, 9119 insertions(+), 42 deletions(-) create mode 100644 examples/SVGView/svg/wooden-easter-egg-holder.svg diff --git a/examples/SVGView/SVGView.upp b/examples/SVGView/SVGView.upp index 003a1f557..3dac8c889 100644 --- a/examples/SVGView/SVGView.upp +++ b/examples/SVGView/SVGView.upp @@ -19,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 diff --git a/examples/SVGView/svg/wooden-easter-egg-holder.svg b/examples/SVGView/svg/wooden-easter-egg-holder.svg new file mode 100644 index 000000000..ddf155d58 --- /dev/null +++ b/examples/SVGView/svg/wooden-easter-egg-holder.svg @@ -0,0 +1,9080 @@ + + + Free Easter Egg Holder Laser Cut SVG File + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + 4 + inches - 6.35 mm + + + 6 mm + + + 4 mm + + + freepatternsarea.com + + + + + + + Free Easter Egg Holder Laser Cut SVG File + 2025.08.26 + + + freepatternsarea.com + + + + + freepatternsarea.com + + + + + Creative Commons Attribution 4.0 International License. (CC BY-NC-SA 4.0) + + + Free Easter egg holder laser cut SVG file with bunny, floral, and egg motifs. Perfect for festive or year-round decoration. + + + + + + + + + + + + diff --git a/uppsrc/Painter/SvgInternal.h b/uppsrc/Painter/SvgInternal.h index a40fd6459..efbd4825b 100644 --- a/uppsrc/Painter/SvgInternal.h +++ b/uppsrc/Painter/SvgInternal.h @@ -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); diff --git a/uppsrc/Painter/SvgParser.cpp b/uppsrc/Painter/SvgParser.cpp index 9ef38df37..329433c21 100644 --- a/uppsrc/Painter/SvgParser.cpp +++ b/uppsrc/Painter/SvgParser.cpp @@ -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 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,27 +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")) { - String text = m.GatherText(); - try { - CParser p(text); - while(!p.IsEof()) { - if(p.Char('.') && p.IsId()) { - String id = p.ReadIdh(); - 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) {} - } + else + if(m.IsTag("style")) + ParseStyle(m); } else if(n.IsTag("linearGradient")) @@ -503,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.ReadIdh(); - 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) From 835ad272d1bf405918eb2eee57c09cb6602f18a0 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Wed, 24 Sep 2025 17:28:13 +0200 Subject: [PATCH 3/4] ide: libclang now using --target instead of redefining macros --- uppbox/Scripts/updateinfo.txt | 7 + uppsrc/ide/clang/clang.cpp | 6 +- uppsrc/ide/clang/clang.h | 1 - uppsrc/ide/clang/clang.upp | 1 - uppsrc/ide/clang/macros.cpp | 454 ---------------------------------- 5 files changed, 12 insertions(+), 457 deletions(-) delete mode 100644 uppsrc/ide/clang/macros.cpp diff --git a/uppbox/Scripts/updateinfo.txt b/uppbox/Scripts/updateinfo.txt index 5a42f4bd8..bc42a1d23 100644 --- a/uppbox/Scripts/updateinfo.txt +++ b/uppbox/Scripts/updateinfo.txt @@ -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 diff --git a/uppsrc/ide/clang/clang.cpp b/uppsrc/ide/clang/clang.cpp index dcb8dca3e..15ed70240 100644 --- a/uppsrc/ide/clang/clang.cpp +++ b/uppsrc/ide/clang/clang.cpp @@ -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, ' ')); diff --git a/uppsrc/ide/clang/clang.h b/uppsrc/ide/clang/clang.h index 341c25498..f7144e85f 100644 --- a/uppsrc/ide/clang/clang.h +++ b/uppsrc/ide/clang/clang.h @@ -78,7 +78,6 @@ struct SourceLocation : Moveable { String ToString() const { return path + ": " + AsString(pos); } }; -String RedefineMacros(); String GetClangInternalIncludes(); enum AdditionalKinds { diff --git a/uppsrc/ide/clang/clang.upp b/uppsrc/ide/clang/clang.upp index 5f60232c4..aaf461874 100644 --- a/uppsrc/ide/clang/clang.upp +++ b/uppsrc/ide/clang/clang.upp @@ -13,7 +13,6 @@ file clang.dli, libclang.cpp, util.cpp, - macros.cpp, clang.cpp, Visitor.cpp, CurrentFile.cpp, diff --git a/uppsrc/ide/clang/macros.cpp b/uppsrc/ide/clang/macros.cpp deleted file mode 100644 index a391e3e27..000000000 --- a/uppsrc/ide/clang/macros.cpp +++ /dev/null @@ -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 um, dm; - auto Parse = [&](const char *s) { - VectorMap 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__"; -} From 8ece2dbbd3fddfd9c8af620eb00c1cd0d4464af9 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Wed, 24 Sep 2025 17:30:02 +0200 Subject: [PATCH 4/4] Makefile(s) updated --- Makefile | 189 ---------------------------------------------------- Makefile.in | 189 ---------------------------------------------------- 2 files changed, 378 deletions(-) diff --git a/Makefile b/Makefile index f2bf152e6..3296c518b 100644 --- a/Makefile +++ b/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 \ diff --git a/Makefile.in b/Makefile.in index f2bf152e6..3296c518b 100644 --- a/Makefile.in +++ b/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 \