1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
| | This patch removes trying to build the bundled dear-imgui library in favor of
the input version. The static option is set in the dependency to mirror the
upstream build (though dear-imgui is built with all available backends
already).
diff --git a/meson.build b/meson.build
index e5cf395..7f8a8e1 100644
--- a/meson.build
+++ b/meson.build
@@ -220,39 +220,14 @@ util_files = files(
'src/mesa/util/os_time.c',
)
-imgui_options = [
- 'default_library=static',
- # use 'auto_features=disabled' once available: https://github.com/mesonbuild/meson/issues/5320
- 'dx9=disabled',
- 'dx10=disabled',
- 'dx11=disabled',
- 'dx12=disabled',
- 'metal=disabled',
- 'opengl=disabled',
- 'vulkan=disabled',
- 'glfw=disabled',
- 'sdl2=disabled',
- 'osx=disabled',
- 'win=disabled',
- 'marmalade=disabled',
- 'allegro5=disabled',
-]
-
sizeof_ptr = cc.sizeof('void*')
if sizeof_ptr == 8
pre_args += '-DMANGOHUD_ARCH="64bit"'
- if get_option('mangoapp')
- imgui_options += [
- 'opengl=enabled',
- 'glfw=enabled',
- ]
- endif
elif sizeof_ptr == 4
pre_args += '-DMANGOHUD_ARCH="32bit"'
endif
-dearimgui_sp = subproject('imgui', default_options: imgui_options)
-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep')
+dearimgui_dep = dependency('imgui', static: true)
spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog'))
if not spdlog_dep.found()
|