From 221d33500688105db9758a8f47ff6a8badc477a4 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Sat, 4 Mar 2023 19:00:47 +0000
Subject: [PATCH] meson: remove mangoapp_32bit option

Was introduced as a means to shorten the build cycles. With the static
lib helper it should no longer be needed.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
 meson_options.txt |  1 -
 src/meson.build   | 66 +++++++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index ef0e83e2..4b9778e9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,7 +14,6 @@ option('with_wayland', type : 'feature', value : 'disabled')
 option('with_dbus', type : 'feature', value : 'enabled')
 option('loglevel', type: 'combo', choices : ['trace', 'debug', 'info', 'warn', 'err', 'critical', 'off'], value : 'info', description: 'Max log level in non-debug build')
 option('mangoapp', type: 'boolean', value : false)
-option('mangoapp_32bit', type: 'boolean', value : false)
 option('mangohudctl', type: 'boolean', value : false)
 option('mangoapp_layer', type: 'boolean', value : false)
 option('tests', type: 'feature', value: 'auto', description: 'Run tests')
diff --git a/src/meson.build b/src/meson.build
index ebc3f6ab..6849ecbe 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -224,40 +224,38 @@ if is_unixy
   )
 endif
 
-if sizeof_ptr != 4 or get_option('mangoapp_32bit')
-  if get_option('mangoapp')
-    pre_args += '-DIMGUI_IMPL_OPENGL_LOADER_GLEW'
-    pre_args += '-DMANGOAPP'
-    mangoapp = executable(
-      'mangoapp',
-      files(
-        'app/main.cpp',
-      ),
-      c_args : [
-        pre_args,
-        vulkan_wsi_args
-        ],
-      cpp_args : [
-        pre_args,
-        vulkan_wsi_args
-        ],
-      gnu_symbol_visibility : 'hidden',
-      dependencies : [
-        dearimgui_dep,
-        dep_dl,
-        spdlog_dep,
-        dbus_dep,
-        dep_x11,
-        glfw3_dep,
-        json_dep,
-      ],
-      include_directories : [inc_common],
-      install_tag : 'mangoapp',
-      link_with: mangohud_static_lib,
-      link_args : link_args,
-      install : true
-    )
-  endif
+if get_option('mangoapp')
+  pre_args += '-DIMGUI_IMPL_OPENGL_LOADER_GLEW'
+  pre_args += '-DMANGOAPP'
+  mangoapp = executable(
+    'mangoapp',
+    files(
+      'app/main.cpp',
+    ),
+    c_args : [
+      pre_args,
+      vulkan_wsi_args
+    ],
+    cpp_args : [
+      pre_args,
+      vulkan_wsi_args
+    ],
+    gnu_symbol_visibility : 'hidden',
+    dependencies : [
+      dearimgui_dep,
+      dep_dl,
+      spdlog_dep,
+      dbus_dep,
+      dep_x11,
+      glfw3_dep,
+      json_dep,
+    ],
+    include_directories : [inc_common],
+    install_tag : 'mangoapp',
+    link_with: mangohud_static_lib,
+    link_args : link_args,
+    install : true
+  )
 endif
 
 if get_option('mangohudctl')