-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.0.0')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.1.0')
cxx = meson.get_compiler('cpp')
qt5 = import('qt5')
libavformatdep = dependency('libavformat')
libswresampledep = dependency('libswresample')
libavutildep = dependency('libavutil')
+libdrmdep = dependency('libdrm')
libjpegdep = dependency('libjpeg')
libswscaledep = dependency('libswscale')
libusbdep = dependency('libusb-1.0')
nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
vax11dep, vadrmdep, x11dep, libavformatdep, libswresampledep, libavcodecdep, libavutildep,
libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
- qcustomplotdep, threaddep, eigendep, srtdep]
+ qcustomplotdep, threaddep, eigendep, srtdep, libdrmdep]
nageru_include_dirs = [include_directories('nageru')]
nageru_link_with = []
nageru_build_rpath = ''
nageru_install_rpath = '$ORIGIN/'
endif
- cefdep = cxx.find_library('cef', dirs: cef_lib_dir)
- nageru_deps += cefdep
-
# CEF wrapper library; not built as part of the CEF binary distribution,
# but should be if CEF is installed as a system library.
if system_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 = ['chrome_100_percent.pak', 'chrome_200_percent.pak', 'resources.pak']
if not get_option('cef_no_icudtl')
cef_resources += ['icudtl.dat']
endif
endforeach
run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
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,
+ # since upstream CEF searches for icudtl.dat in whatever path dladdr() says libcef.so
+ # comes from, and the upstream CEF tarballs have libcef.so and icudtl.dat in different
+ # directories. Thus, get both from the local symlinks we just created.
+ cefdep = cxx.find_library('cef', dirs: meson.current_build_dir())
+ nageru_deps += cefdep
endif
# bmusb.
meson.add_install_script('nageru/scripts/setup_nageru_symlink.sh')
# Kaeru executable.
-executable('kaeru', 'nageru/kaeru.cpp',
+executable('kaeru', ['nageru/kaeru.cpp', 'nageru/nageru_cef_app.cpp'],
dependencies: [nageru_deps, kaeru_extra_deps],
include_directories: nageru_include_dirs,
link_with: [stream, aux, kaeru_link_with],