From a347f77b3c71ffa68881c4b36548bf58ffb201a5 Mon Sep 17 00:00:00 2001
From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Date: Sat, 1 Jun 2024 13:40:58 +1000
Subject: [PATCH] fix some git merge conflicts that weren't resolved (#55)

and added -latomic to build flags to fix compile warnings while compiling miniaudio
---
 Makefile                | 1 +
 data/dynos_gfx_init.cpp | 2 +-
 src/pc/pc_main.c        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3c5d120e..b4b82edf 100644
--- a/Makefile
+++ b/Makefile
@@ -963,6 +963,7 @@ endif
 # Prevent a crash with -sopt
 export LANG := C
 
+LDFLAGS += -latomic
 
 #==============================================================================#
 # Extra CC Flags                                                               #
diff --git a/data/dynos_gfx_init.cpp b/data/dynos_gfx_init.cpp
index eca9c796..3a9ba586 100644
--- a/data/dynos_gfx_init.cpp
+++ b/data/dynos_gfx_init.cpp
@@ -2,7 +2,7 @@
 #include "pc/loading.h"
 
 void DynOS_Gfx_GeneratePacks(const char* directory) {
-    snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Packs In Path:\n\\#808080\\%s", directory);
+    REFRESH_MUTEX(snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Packs In Path:\n\\#808080\\%s", directory));
 
     DIR *modsDir = opendir(directory);
     if (!modsDir) { return; }
diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c
index 095b763b..e120c7b6 100644
--- a/src/pc/pc_main.c
+++ b/src/pc/pc_main.c
@@ -313,7 +313,7 @@ void* main_game_init(void* isThreaded) {
     // load language
     if (!djui_language_init(configLanguage)) { snprintf(configLanguage, MAX_CONFIG_STRING, "%s", ""); }
 
-    if (gIsThreaded) { REFRESH_MUTEX(loading_screen_set_segment_text("Loading")); }
+    REFRESH_MUTEX(loading_screen_set_segment_text("Loading"));
     dynos_gfx_init();
     enable_queued_dynos_packs();
     sync_objects_init_system();
@@ -322,7 +322,7 @@ void* main_game_init(void* isThreaded) {
     //     check_for_updates();
     // }
 
-    if (gIsThreaded) { REFRESH_MUTEX(loading_screen_set_segment_text("Loading ROM Assets")); }
+    REFRESH_MUTEX(loading_screen_set_segment_text("Loading ROM Assets"));
     rom_assets_load();
     smlua_text_utils_init();