Skip to content

Commit 158cc14

Browse files
authored
add libretro-common dependencies (#18464)
ARM linux uses features_cpu.c from libretro-common, which in turn requires all of these dependencies. x86/_64 builds don't build features_cpu.c, but it doesn't hurt to build these anyway in that case.
1 parent 9d5921c commit 158cc14

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

cores/libretro-ffmpeg/Makefile.common

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GL_SOURCE :=
88

99
CPUOPTS :=
1010
DEPS_DIR := $(CORE_DIR)/deps
11-
LIBRETRO_COMM_DIR := $(CORE_DIR)/../../libretro-common
11+
LIBRETRO_COMM_DIR ?= $(CORE_DIR)/../../libretro-common
1212
BASE_DIR := $(CORE_DIR)/..
1313
AVFORMAT_DIR := $(BASE_DIR)/libavformat
1414
AVCODEC_DIR := $(BASE_DIR)/libavcodec
@@ -155,6 +155,20 @@ else
155155
endif
156156
GL_SOURCE += $(LIBRETRO_COMM_DIR)/glsym/rglgen.c
157157

158+
# Required for libretro-common/features_cpu.c
159+
ifeq ($(platform), unix)
160+
SOURCES_C += $(LIBRETRO_COMM_DIR)/streams/file_stream.c \
161+
$(LIBRETRO_COMM_DIR)/string/stdstring.c \
162+
$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \
163+
$(LIBRETRO_COMM_DIR)/file/file_path.c \
164+
$(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
165+
$(LIBRETRO_COMM_DIR)/file/file_path_io.c \
166+
$(LIBRETRO_COMM_DIR)/time/rtime.c \
167+
$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
168+
$(LIBRETRO_COMM_DIR)/file/file_path_io.c \
169+
$(LIBRETRO_COMM_DIR)/time/rtime.c
170+
endif
171+
158172
ifeq ($(HAVE_GL_FFT), 1)
159173
DEFINES += -DHAVE_GL_FFT
160174
FFT_SOURCE += $(CORE_DIR)/ffmpeg_fft.c
@@ -165,7 +179,7 @@ ifeq ($(HAVE_PTHREADS),1)
165179
LIBS += -lpthread
166180
endif
167181

168-
SOURCES_C := $(GL_SOURCE) \
182+
SOURCES_C += $(GL_SOURCE) \
169183
$(DEPS_SOURCE) \
170184
$(LIBRETRO_SOURCE) \
171185
$(LIBAVUTIL_SOURCE) \

0 commit comments

Comments
 (0)