mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ffmpeg

Browse Source
This commit is contained in:
twinaphex 2016-09-07 13:19:28 +02:00
parent 39f3808c96
commit 2945605b61
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cores/libretro-ffmpeg/Makefile
View File

@ -157,7 +157,24 @@ endif
HAVE_NETWORK = 1 HAVE_NETWORK = 1
HAVE_SOCKLEN = 1 HAVE_SOCKLEN = 1
else ifneq (,$(findstring win,$(platform))) else ifeq ($(platform), emscripten)
ARCH_X86 = 0
ARCH_X86_64=0
ARCH_ARM = 0
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
STATIC_LINKING=1
HAVE_PTHREADS=1
LIBRETRO_SWITCH = 1
CFLAGS += -DHAVE_UNISTD_H
CFLAGS += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO
HAVE_POLL_H = 1
HAVE_GETADDRINFO = 1
HAVE_NETWORK = 1
HAVE_SOCKLEN = 1
HAVE_PTHREADS=1
# Windows
else
ARCH_X86 = 1 ARCH_X86 = 1
CC = gcc CC = gcc
@ -198,7 +215,11 @@ all: $(TARGET)
$(CXX) -c -fno-strict-aliasing -o $@ $< $(CFLAGS) $(CXX) -c -fno-strict-aliasing -o $@ $< $(CFLAGS)
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING),1)
$(AR) rcs $@ $(OBJECTS)
else
$(CXX) -o $@ $^ $(LIBS) $(SHARED) $(CXX) -o $@ $^ $(LIBS) $(SHARED)
endif
clean: clean:
rm -f $(OBJECTS) rm -f $(OBJECTS)

2
cores/libretro-ffmpeg/Makefile.common
View File

@ -17,7 +17,7 @@ SWSCALE_DIR := $(BASE_DIR)/libswscale
SWRESAMPLE_DIR := $(BASE_DIR)/libswresample SWRESAMPLE_DIR := $(BASE_DIR)/libswresample
INCFLAGS += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include INCFLAGS += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include -I$(LIBRETRO_COMM_DIR)/include/compat
LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \ LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \
$(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \ $(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \