From 0d42b42459cef0fc52c2eecfb076edc9b689c9d0 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 30 May 2021 20:35:08 +0200 Subject: [PATCH] Added alternate name for libSDL2_image, libSDL2_ttf and libexpat --- src/library_list.h | 3 +++ src/main.c | 2 +- src/tools/bridge.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/library_list.h b/src/library_list.h index 3122a4edbe..f844a8fab9 100755 --- a/src/library_list.h +++ b/src/library_list.h @@ -16,7 +16,9 @@ GO("libsdl2-2.0.so.0", sdl2) GO("libSDL2_mixer-2.0.so.0", sdl2mixer) GO("libSDL2_net-2.0.so.0", sdl2net) GO("libSDL2_image-2.0.so.0", sdl2image) +GO("libSDL2_image.so", sdl2image) GO("libSDL2_ttf-2.0.so.0", sdl2ttf) +GO("libSDL2_ttf.so", sdl2ttf) GO("libSDL-1.2.so.0", sdl1) GO("libSDL-1.1.so.0", sdl1) GO("libSDL_mixer-1.2.so.0", sdl1mixer) @@ -114,6 +116,7 @@ GO("libnm-util.so.2", libnm) GO("libfontconfig.so.1", fontconfig) GO("libbz2.so.1", bz2) GO("libexpat.so.1", expat) +GO("libexpat.so", expat) GO("libSM.so.6", libsm) GO("libICE.so.6", libice) GO("libusb-1.0.so.0", libusb1) diff --git a/src/main.c b/src/main.c index a3a6913f6b..c76b8240ce 100755 --- a/src/main.c +++ b/src/main.c @@ -241,7 +241,7 @@ void LoadLogEnv() p = getenv("BOX86_DYNAREC_DUMP"); if(p) { if(strlen(p)==1) { - if(p[0]>='0' && p[0]<='1') + if(p[0]>='0' && p[0]<='2') box86_dynarec_dump = p[0]-'0'; } if (box86_dynarec_dump) printf_log(LOG_INFO, "Dynarec blocks are dumped%s\n", (box86_dynarec_dump>1)?" in color":""); diff --git a/src/tools/bridge.c b/src/tools/bridge.c index ced3adb8e0..4797c34079 100755 --- a/src/tools/bridge.c +++ b/src/tools/bridge.c @@ -55,6 +55,8 @@ bridge_t *NewBridge() } void FreeBridge(bridge_t** bridge) { + if(!bridge || !*bridge) + return; brick_t *b = (*bridge)->head; while(b) { brick_t *n = b->next;