X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=4f96702dbad8e980e4fc744e7f15ba568f57a442;hb=364fd0dca48e413048f4c6010146123ee6fd922c;hp=56ea5be0e3bfb4978a81c82f35611b8486a47917;hpb=e18a2651624dd1cda2d28a8224cd6384c1424e13;p=nageru

diff --git a/meson.build b/meson.build
index 56ea5be..4f96702 100644
--- a/meson.build
+++ b/meson.build
@@ -128,25 +128,25 @@ if have_cef
 	endif
 
 	cef_libs = ['libEGL.so', 'libGLESv2.so', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
-	cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
+	cef_resources = ['resources.pak', 'chrome_100_percent.pak', 'chrome_200_percent.pak']
 	if not get_option('cef_no_icudtl')
 		cef_resources += ['icudtl.dat']
 	endif
 	if cef_build_type != 'system'
-		cef_libs += ['libcef.so']
+		cef_libs += ['libcef.so', 'libEGL.so', 'libGLESv2.so', 'libvk_swiftshader.so', 'libvulkan.so.1', 'vk_swiftshader_icd.json']
 	endif
 
 	# Symlink the files into the build directory, so that running nageru without ninja install works.
-	run_command('mkdir', join_paths(meson.current_build_dir(), 'locales/'))
+	run_command('mkdir', '-p', join_paths(meson.current_build_dir(), 'locales/'), check: true)
 	foreach file : cef_libs
-		run_command('ln', '-s', join_paths(cef_lib_dir, file), meson.current_build_dir())
+		run_command('ln', '-sf', join_paths(cef_lib_dir, file), meson.current_build_dir(), check: true)
 		install_data(join_paths(cef_lib_dir, file), install_dir: exe_dir)
 	endforeach
 	foreach file : cef_resources
-		run_command('ln', '-s', join_paths(cef_resource_dir, file), meson.current_build_dir())
+		run_command('ln', '-sf', join_paths(cef_resource_dir, file), meson.current_build_dir(), check: true)
 		install_data(join_paths(cef_resource_dir, file), install_dir: exe_dir)
 	endforeach
-	run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
+	run_command('ln', '-sf', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'), check: true)
 	install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
 
 	# NOTE: We link against libcef.so in the local directory, _not_ in the CEF directory,
@@ -238,7 +238,7 @@ nageru_srcs += proto_generated
 # Shaders needed at runtime.
 shaders = ['nageru/cbcr_subsample.vert', 'nageru/cbcr_subsample.frag', 'nageru/uyvy_subsample.vert', 'nageru/uyvy_subsample.frag', 'nageru/v210_subsample.comp', 'nageru/timecode.vert', 'nageru/timecode.frag', 'nageru/timecode_10bit.frag']
 foreach shader : shaders
-	run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir())
+	run_command('ln', '-sf', join_paths(meson.current_source_dir(), shader), meson.current_build_dir(), check: true)
 endforeach
 
 nageru_shader_srcs = bin2h_gen.process(shaders)
@@ -277,7 +277,7 @@ executable('benchmark_audio_mixer', 'nageru/benchmark_audio_mixer.cpp', dependen
 data_files = ['nageru/theme.lua', 'nageru/simple.lua', 'nageru/bg.jpeg', 'nageru/akai_midimix.midimapping', 'futatabi/behringer_cmd_pl1.midimapping']
 install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru'))
 foreach file : data_files
-	run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir())
+	run_command('ln', '-sf', join_paths(meson.current_source_dir(), file), meson.current_build_dir(), check: true)
 endforeach
 
 # Futatabi. (Not a subdir() because we don't want the output in nageru/nageru.)
@@ -314,7 +314,7 @@ shaders += ['futatabi/add_base_flow.frag', 'futatabi/blend.frag', 'futatabi/chro
 	'futatabi/sobel.frag', 'futatabi/sor.frag', 'futatabi/splat.frag']
 
 foreach shader : shaders
-	run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir())
+	run_command('ln', '-sf', join_paths(meson.current_source_dir(), shader), meson.current_build_dir(), check: true)
 endforeach
 
 futatabi_shader_srcs = bin2h_gen.process(shaders)