From 28916338776f4d2006dbf3f380cc021f319eb923 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 27 Nov 2023 09:25:06 -0500 Subject: [PATCH] Meta: Port recent changes to the GN build 9836a9ad0ef93bdace6620be715766805cc4aed4 bc9cdd439405b8eb1a7712acfb4adbc9aa636b11 28723d8be104e5d8d5336e4adf2d6ed3df7e5121 f4a5c136c3ab05e084ce1172805d1dab376c8125 --- .../Userland/Libraries/LibAccelGfx/BUILD.gn | 1 + .../Userland/Libraries/LibCrypto/BUILD.gn | 2 -- .../Userland/Libraries/LibGfx/BUILD.gn | 27 ++++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Meta/gn/secondary/Userland/Libraries/LibAccelGfx/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibAccelGfx/BUILD.gn index de032d04b5..09bd2ceafa 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibAccelGfx/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibAccelGfx/BUILD.gn @@ -20,6 +20,7 @@ shared_library("LibAccelGfx") { "Forward.h", "GL.cpp", "GL.h", + "GlyphAtlas.cpp", "Painter.cpp", "Painter.h", "Program.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibCrypto/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibCrypto/BUILD.gn index 770e274bb0..a703c08304 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibCrypto/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibCrypto/BUILD.gn @@ -30,8 +30,6 @@ shared_library("LibCrypto") { "Cipher/ChaCha20.cpp", "Curves/Curve25519.cpp", "Curves/Ed25519.cpp", - "Curves/SECP256r1.cpp", - "Curves/SECP384r1.cpp", "Curves/X25519.cpp", "Curves/X448.cpp", "Hash/BLAKE2b.cpp", diff --git a/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn index a1266e82fd..62d44f2dcc 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn @@ -1,9 +1,30 @@ +action("generate_tiff_sources") { + script = "//Userland/Libraries/LibGfx/TIFFGenerator.py" + + args = [ + "-o", + rebase_path("$target_gen_dir/ImageFormats", root_build_dir), + ] + + outputs = [ + "$target_gen_dir/ImageFormats/TIFFMetadata.h", + "$target_gen_dir/ImageFormats/TIFFTagHandler.cpp", + ] + + # FIXME: install header into $prefix/include/LibGfx/ImageFormats on serenity +} + +config("tiff_headers") { + include_dirs = [ "$target_gen_dir/.." ] +} + shared_library("LibGfx") { output_name = "gfx" include_dirs = [ "//Userland/Libraries", "//Userland", ] + public_configs = [ ":tiff_headers" ] sources = [ "AffineTransform.cpp", "AntiAliasingPainter.cpp", @@ -61,11 +82,11 @@ shared_library("LibGfx") { "ImageFormats/QOIWriter.cpp", "ImageFormats/TGALoader.cpp", "ImageFormats/TIFFLoader.cpp", - "ImageFormats/TIFFTagHandler.cpp", "ImageFormats/TinyVGLoader.cpp", "ImageFormats/WebPLoader.cpp", "ImageFormats/WebPLoaderLossless.cpp", "ImageFormats/WebPLoaderLossy.cpp", + "ImmutableBitmap.cpp", "Painter.cpp", "Palette.cpp", "Path.cpp", @@ -81,7 +102,11 @@ shared_library("LibGfx") { "VectorGraphic.cpp", "WindowTheme.cpp", ] + + sources += get_target_outputs(":generate_tiff_sources") + deps = [ + ":generate_tiff_sources", "//AK", "//Userland/Libraries/LibCompress", "//Userland/Libraries/LibCore",