Build fix after update

libretro · Feb 5, 2024 · f9b3fff · f9b3fff
1 parent 968efb6
commit f9b3fff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/libretro-build/Makefile.common b/libretro-build/Makefile.common
@@ -126,6 +126,7 @@ SOURCES_C :=   $(CORE_DIR)/src/arm/arm.c \
 					$(CORE_DIR)/src/util/patch-ups.c \
 					$(CORE_DIR)/src/util/string.c \
 					$(CORE_DIR)/src/util/table.c \
+					$(CORE_DIR)/src/util/vector.c \
 					$(CORE_DIR)/src/util/vfs.c \
 					$(CORE_DIR)/src/util/vfs/vfs-mem.c \
 					$(CORE_DIR)/src/util/crc32.c

diff --git a/src/gba/bios.c b/src/gba/bios.c
@@ -185,14 +185,6 @@ static void _RegisterRamReset(struct GBA* gba) {
 			gba->video.renderer->writeVideoRegister(gba->video.renderer, i, gba->memory.io[i >> 1]);
 		}
 	}
-	if (registers & 0x9C) {
-		gba->video.renderer->reset(gba->video.renderer);
-		gba->video.renderer->writeVideoRegister(gba->video.renderer, REG_DISPCNT, gba->memory.io[REG_DISPCNT >> 1]);
-		int i;
-		for (i = REG_BG0CNT; i < REG_SOUND1CNT_LO; i += 2) {
-			gba->video.renderer->writeVideoRegister(gba->video.renderer, i, gba->memory.io[i >> 1]);
-		}
-	}
 }
 
 static void _BgAffineSet(struct GBA* gba) {

diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c
@@ -2345,9 +2345,9 @@ size_t retro_get_memory_size(unsigned id) {
 		}
 		break;
 	case RETRO_MEMORY_SYSTEM_RAM:
-		return SIZE_WORKING_RAM;
+		return GB_SIZE_WORKING_RAM;
 	case RETRO_MEMORY_VIDEO_RAM:
-		return SIZE_VRAM;
+		return GBA_SIZE_VRAM;
 	default:
 		break;
 	}
@@ -2367,6 +2367,7 @@ void GBARetroLog(struct mLogger* logger, int category, enum mLogLevel level, con
 	switch (level) {
 	case mLOG_ERROR:
 	case mLOG_FATAL:
+    case mLOG_ALL:
 		retroLevel = RETRO_LOG_ERROR;
 		break;
 	case mLOG_WARN:

diff --git a/src/util/vfs.c b/src/util/vfs.c
@@ -211,6 +211,7 @@ void separatePath(const char* path, char* dirname, char* basename, char* extensi
 	}
 }
 
+#if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
 bool isAbsolute(const char* path) {
 	// XXX: Is this robust?
 #ifdef _WIN32
@@ -245,6 +246,7 @@ void makeAbsolute(const char* path, const char* base, char* out) {
 #endif
 	strncpy(out, buf, PATH_MAX);
 }
+#endif
 
 struct VFile* VDirFindFirst(struct VDir* dir, bool (*filter)(struct VFile*)) {
 	dir->rewind(dir);