From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 1 Mar 2024 10:51:28 +0000 (+0100)
Subject: Remove a now-obsolete Meson workaround, which also fixes a warning.
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=47ef247a83504c5516e397d5066417e7e1d9d26d

Remove a now-obsolete Meson workaround, which also fixes a warning.
---

diff --git a/meson.build b/meson.build
index 2be9488..b190b4a 100644
--- a/meson.build
+++ b/meson.build
@@ -122,13 +122,10 @@ if have_cef
 
 		cef_dll_target = custom_target('libcef_dll_wrapper',
 			input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
-			output: ['libcef_dll_wrapper.a', 'cef-stamp'],
+			output: ['libcef_dll_wrapper.a'],
 			command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
 
-		# Putting the .a in sources seemingly hits a bug where the .a files get sorted
-		# in the wrong order. This is a workaround; see
-		# https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
-		cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
+		cefdlldep = declare_dependency(link_with: cef_dll_target)
 		nageru_deps += cefdlldep
 	endif
 
diff --git a/nageru/scripts/compile_cef_dll_wrapper.sh b/nageru/scripts/compile_cef_dll_wrapper.sh
index ee8dbb2..c819f54 100755
--- a/nageru/scripts/compile_cef_dll_wrapper.sh
+++ b/nageru/scripts/compile_cef_dll_wrapper.sh
@@ -5,10 +5,8 @@ BUILD_DIR="$1"
 CEF_DIR="$2"
 CMAKE="$3"
 OUTPUT="$4"
-STAMP="$5"
 
 ! [ -d "$BUILD_DIR" ] || rm -r "$BUILD_DIR"
 mkdir "$BUILD_DIR"
 ( cd "$BUILD_DIR" && $CMAKE -G Ninja "$CEF_DIR" && ninja libcef_dll_wrapper )
 cp "$BUILD_DIR"/libcef_dll_wrapper/libcef_dll_wrapper.a "$OUTPUT"
-touch "$STAMP"