Fix --disable-menu errors

libretro · Aug 14, 2023 · c8e6506 · c8e6506
1 parent ae78395
commit c8e6506
Show file tree

Hide file tree

Showing 10 changed files with 387 additions and 367 deletions.
diff --git a/audio/microphone_driver.c b/audio/microphone_driver.c
@@ -14,18 +14,21 @@
  */
 
 #include <math.h>
+#include <memalign.h>
+#include <audio/conversion/s16_to_float.h>
+#include <audio/conversion/float_to_s16.h>
+#include <retro_assert.h>
+#include <string/stdstring.h>
+#include <audio/conversion/dual_mono.h>
+
 #include "microphone_driver.h"
+#include "audio_defines.h"
+
 #include "../configuration.h"
 #include "../driver.h"
-#include "../verbosity.h"
-#include "../runloop.h"
-#include "memalign.h"
-#include "audio/conversion/s16_to_float.h"
-#include "audio/conversion/float_to_s16.h"
 #include "../list_special.h"
-#include "retro_assert.h"
-#include "string/stdstring.h"
-#include "audio/conversion/dual_mono.h"
+#include "../runloop.h"
+#include "../verbosity.h"
 
 static microphone_driver_state_t mic_driver_st;
 
@@ -857,4 +860,4 @@ bool microphone_driver_get_devices_list(void **data)
       return false;
    *ptr = mic_driver_st.devices_list;
    return true;
-}
+}
diff --git a/cheevos/cheevos_menu.c b/cheevos/cheevos_menu.c
@@ -13,23 +13,23 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <features/features_cpu.h>
+#include <retro_assert.h>
+
 #include "cheevos_locals.h"
 
 #include "../gfx/gfx_display.h"
+#include "../file_path_special.h"
 
 #ifdef HAVE_MENU
 
 #include "cheevos.h"
 
 #include "../deps/rcheevos/include/rc_runtime_types.h"
 
-#include "../file_path_special.h"
 #include "../menu/menu_driver.h"
 #include "../menu/menu_entries.h"
 
-#include <features/features_cpu.h>
-#include <retro_assert.h>
-
 enum rcheevos_menuitem_bucket
 {
    RCHEEVOS_MENUITEM_BUCKET_UNKNOWN = 0,
@@ -98,7 +98,7 @@ static void rcheevos_menu_update_buckets(void)
 {
    const rcheevos_locals_t *rcheevos_locals = get_rcheevos_locals();
    rcheevos_racheevo_t     *cheevo          = rcheevos_locals->game.achievements;
-   rcheevos_racheevo_t     *stop            = cheevo + 
+   rcheevos_racheevo_t     *stop            = cheevo +
       rcheevos_locals->game.achievement_count;
 
    while (cheevo < stop)
@@ -261,7 +261,7 @@ static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
          cheevo->menu_badge_texture   = new_badge_texture;
          cheevo->menu_badge_grayscale = badge_grayscale;
       }
-      /* menu_badge_grayscale is overloaded such 
+      /* menu_badge_grayscale is overloaded such
        * that any value greater than 1 indicates
        * the server default image is being used */
       else if (cheevo->menu_badge_grayscale < 2)
@@ -594,7 +594,7 @@ void rcheevos_menu_populate(void* data)
       unsigned idx                  = 0;
       /* convert to menu entries */
       rcheevos_menuitem_t* menuitem = rcheevos_locals->menuitems;
-      rcheevos_menuitem_t* stop     = menuitem + 
+      rcheevos_menuitem_t* stop     = menuitem +
          rcheevos_locals->menuitem_count;
 
       do
@@ -671,7 +671,7 @@ uintptr_t rcheevos_get_badge_texture(const char *badge, bool locked)
       _len  = strlcpy(badge_file, badge, sizeof(badge_file));
       _len += strlcpy(badge_file + _len, locked ? "_lock" : "",
             sizeof(badge_file)   - _len);
-      strlcpy(badge_file + _len, FILE_PATH_PNG_EXTENSION,
+      strlcpy(badge_file + _len, ".png",
             sizeof(badge_file)   - _len);
 
       fill_pathname_application_special(fullpath, sizeof(fullpath),

diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "../font_driver.h"
+#include "../gfx_display.h"
 
 #include "../../configuration.h"
 #include "../../retroarch.h"
@@ -60,7 +61,7 @@ HDC          win32_gdi_hdc;
 static void *dinput_gdi;
 
 /*
- * DISPLAY DRIVER 
+ * DISPLAY DRIVER
  */
 
 static const float *gfx_display_gdi_get_default_vertices(void)
@@ -162,7 +163,7 @@ gfx_display_ctx_driver_t gfx_display_ctx_gdi = {
 };
 
 /*
- * FONT DRIVER 
+ * FONT DRIVER
  */
 
 typedef struct
@@ -341,7 +342,7 @@ font_renderer_t gdi_font = {
 };
 
 /*
- * VIDEO DRIVER 
+ * VIDEO DRIVER
  */
 
 static void gfx_ctx_gdi_get_video_size(
@@ -932,7 +933,7 @@ static uintptr_t gdi_load_texture(void *video_data, void *data,
    return (uintptr_t)texture;
 }
 
-static void gdi_unload_texture(void *data, 
+static void gdi_unload_texture(void *data,
       bool threaded, uintptr_t handle)
 {
    struct gdi_texture *texture = (struct gdi_texture*)handle;