Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some git merge conflicts that weren't resolved (#55) 

and added -latomic to build flags to fix compile warnings while compiling miniaudio
This commit is contained in:
Isaac0-dev 2024-06-01 13:40:58 +10:00 committed by GitHub
parent b0be6143fb
commit a347f77b3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -963,6 +963,7 @@ endif
# Prevent a crash with -sopt # Prevent a crash with -sopt
export LANG := C export LANG := C
LDFLAGS += -latomic
#==============================================================================# #==============================================================================#
# Extra CC Flags # # Extra CC Flags #

2
data/dynos_gfx_init.cpp
View File

@ -2,7 +2,7 @@
#include "pc/loading.h" #include "pc/loading.h"
void DynOS_Gfx_GeneratePacks(const char* directory) { 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); DIR *modsDir = opendir(directory);
if (!modsDir) { return; } if (!modsDir) { return; }

4
src/pc/pc_main.c
View File

@ -313,7 +313,7 @@ void* main_game_init(void* isThreaded) {
// load language // load language
if (!djui_language_init(configLanguage)) { snprintf(configLanguage, MAX_CONFIG_STRING, "%s", ""); } 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(); dynos_gfx_init();
enable_queued_dynos_packs(); enable_queued_dynos_packs();
sync_objects_init_system(); sync_objects_init_system();
@ -322,7 +322,7 @@ void* main_game_init(void* isThreaded) {
// check_for_updates(); // 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(); rom_assets_load();
smlua_text_utils_init(); smlua_text_utils_init();