]> git.sesse.net Git - nageru/blobdiff - meson.build
Set CEF autoplay policy to be more lenient.
[nageru] / meson.build
index 3c139c704e792459c3071ec93078d0936da45eb2..b190b4ab757126b82294bc0f340492c1a9b73a37 100644 (file)
@@ -1,4 +1,6 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.2.4-pre')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.1-pre')
+
+add_project_arguments('-Wno-unqualified-std-cast-call', language: 'cpp')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -120,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