Fix some uglyness in meson build
@@ -220,28 +220,6 @@ util_files = files(
'src/mesa/util/os_time.c',
)
-sizeof_ptr = cc.sizeof('void*')
-if sizeof_ptr == 8
- pre_args += '-DMANGOHUD_ARCH="64bit"'
- if get_option('mangoapp')
- 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=enabled',
- 'vulkan=disabled',
- 'glfw=enabled',
- 'sdl2=disabled',
- 'osx=disabled',
- 'win=disabled',
- 'marmalade=disabled',
- 'allegro5=disabled',
- ]
- else
imgui_options = [
'default_library=static',
# use 'auto_features=disabled' once available: https://github.com/mesonbuild/meson/issues/5320
@@ -259,26 +237,18 @@ if sizeof_ptr == 8
'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"'
- 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',
- ]
endif
dearimgui_sp = subproject('imgui', default_options: imgui_options)
