Revert "Update VFS implementation to current libretro-common (#354)" (#…

…356) This reverts commit 89d2c90.
libretro · Jun 29, 2024 · 5355eae · 5355eae
1 parent 6c72b77
commit 5355eae
Show file tree

Hide file tree

Showing 61 changed files with 2,751 additions and 5,537 deletions.
diff --git a/Makefile.libretro b/Makefile.libretro
@@ -840,6 +840,12 @@ LIBRETRO_CFLAGS += $(BPP_DEFINES) \
 		-DHAVE_OPLL_CORE \
 		-DMAXROMSIZE=$(MAX_ROM_SIZE)
 
+ifneq (,$(findstring msvc,$(platform)))
+   LIBRETRO_CFLAGS += -DINLINE="static _inline"
+else
+   LIBRETRO_CFLAGS += -DINLINE="static inline"
+endif
+
 OBJOUT   = -o
 LINKOUT  = -o 
 

diff --git a/core/macros.h b/core/macros.h
@@ -42,12 +42,8 @@
  * If you define INLINE in makefile or osd.h, it will override this value.
  * NOTE: not enabling inline functions will SEVERELY slow down emulation.
  */
-#ifndef INLINE
-#if defined(_MSC_VER)
-#define INLINE static _inline
-#else
-#define INLINE static __inline__
-#endif
+#ifndef INLINE
+#define INLINE static __inline__
 #endif /* INLINE */
 
 /* Alignment macros for cross compiler compatibility */

diff --git a/libretro/Makefile.common b/libretro/Makefile.common
@@ -72,8 +72,7 @@ endif
 ifeq ($(HAVE_CDROM), 1)
 SOURCES_C += \
 				 $(LIBRETRO_COMM_DIR)/cdrom/cdrom.c \
-				 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.c \
-                 $(LIBRETRO_COMM_DIR)/time/rtime.c
+				 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_cdrom.c
 endif
 SOURCES_C += \
              $(LIBRETRO_DEPS_DIR)/zlib-1.2.11/adler32.c \

diff --git a/libretro/deps/libchdr/include/libchdr/cdrom.h b/libretro/deps/libchdr/include/libchdr/cdrom.h
@@ -16,14 +16,6 @@
 #include <stdint.h>
 #include <libchdr/chdconfig.h>
 
-#ifndef INLINE
-#if defined(_MSC_VER)
-#define INLINE static _inline
-#else
-#define INLINE static __inline__
-#endif
-#endif /* INLINE */
-
 /***************************************************************************
     CONSTANTS
 ***************************************************************************/