Update

libretro · May 18, 2024 · 44dc27d · 44dc27d
1 parent d5fb4ff
commit 44dc27d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 40 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -19,34 +19,35 @@ FLAGS += -I$(CORE_DIR)/vendor/libretro-common/include \
 	-DHAVE_RWAV=1
 # Only compile libretro-common when not STATIC_LINKING
 ifneq ($(STATIC_LINKING), 1)
-	SOURCES_C += $(wildcard \
-		$(CORE_DIR)/vendor/libretro-common/audio/audio_mix.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/audio_mixer.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/conversion/*.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/resampler/audio_resampler.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/nearest_resampler.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/null_resampler.c \
-		$(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/sinc_resampler.c \
-		$(CORE_DIR)/vendor/libretro-common/compat/compat_posix_string.c \
-		$(CORE_DIR)/vendor/libretro-common/compat/compat_strcasestr.c \
-		$(CORE_DIR)/vendor/libretro-common/compat/compat_strl.c \
-		$(CORE_DIR)/vendor/libretro-common/compat/fopen_utf8.c \
-		$(CORE_DIR)/vendor/libretro-common/encodings/encoding_utf.c \
-		$(CORE_DIR)/vendor/libretro-common/features/features_cpu.c \
-		$(CORE_DIR)/vendor/libretro-common/file/config_file.c \
-		$(CORE_DIR)/vendor/libretro-common/file/config_file_userdata.c \
-		$(CORE_DIR)/vendor/libretro-common/file/file_path.c \
-		$(CORE_DIR)/vendor/libretro-common/file/file_path_io.c \
-		$(CORE_DIR)/vendor/libretro-common/file/retro_dirent.c \
-		$(CORE_DIR)/vendor/libretro-common/time/rtime.c \
-		$(CORE_DIR)/vendor/libretro-common/formats/wav/rwav.c \
-		$(CORE_DIR)/vendor/libretro-common/lists/string_list.c \
-		$(CORE_DIR)/vendor/libretro-common/memmap/memalign.c \
-		$(CORE_DIR)/vendor/libretro-common/rthreads/rthreads.c \
-		$(CORE_DIR)/vendor/libretro-common/streams/file_stream.c \
-		$(CORE_DIR)/vendor/libretro-common/string/stdstring.c \
-		$(CORE_DIR)/vendor/libretro-common/vfs/vfs_implementation.c \
-	)
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/audio_mix.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/audio_mixer.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/float_to_s16.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/float_to_s16_neon.c
+	#SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/mono_to_stereo_float.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/s16_to_float.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/s16_to_float_neon.c
+	#SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/conversion/stereo_to_mono_float.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/resampler/audio_resampler.c
+	#SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/nearest_resampler.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/sinc_resampler.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/compat/compat_posix_string.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/compat/compat_strcasestr.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/compat/compat_strl.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/file/config_file.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/file/config_file_userdata.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/file/file_path.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/file/file_path_io.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/features/features_cpu.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/encodings/encoding_utf.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/formats/wav/rwav.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/lists/string_list.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/memmap/memalign.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/streams/file_stream.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/rthreads/rthreads.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/string/stdstring.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/time/rtime.c
+	SOURCES_C += $(CORE_DIR)/vendor/libretro-common/vfs/vfs_implementation.c
+
     # Ensure the sinc_resampler_neon is available for ARM NEON devices.
 	SOURCES_S += $(CORE_DIR)/vendor/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S
 

diff --git a/src/libretro.cpp b/src/libretro.cpp
@@ -7,8 +7,6 @@
 #define __STDC_FORMAT_MACROS
 #include "ChaiLove.h"
 #include "LibretroLog.h"
-#include <retro_dirent.h>
-#include <streams/file_stream.h>
 
 static void fallback_log(enum retro_log_level level,
 			 const char *fmt, ...);
@@ -86,15 +84,6 @@ void retro_set_environment(retro_environment_t cb) {
 	// Configure the core options.
 	libretro_set_core_options(cb);
 
-	struct retro_vfs_interface_info vfs_interface_info;
-	vfs_interface_info.required_interface_version = DIRENT_REQUIRED_VFS_VERSION;
-	vfs_interface_info.iface = NULL;
-	if (cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_interface_info)) {
-		vfs_interface = vfs_interface_info.iface;
-		filestream_vfs_init(&vfs_interface_info);
-		dirent_vfs_init(&vfs_interface_info);
-	}
-
 	struct retro_log_callback log;
 
 	if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log)) {

diff --git a/src/love/audio.cpp b/src/love/audio.cpp
@@ -3,7 +3,7 @@
 #include "Types/Audio/SoundData.h"
 #include "../ChaiLove.h"
 #include "sound.h"
-#include "audio/conversion/float_to_s16.h"
+//#include "audio/conversion/float_to_s16.h"
 
 using love::Types::Audio::SoundData;