CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-03 10:13:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update libretro-ffmpeg

Browse Source
This commit is contained in:
twinaphex 2016-09-05 20:48:27 +02:00
parent ed5b82f4c2
commit 1b94fd2fce
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/libretro-ffmpeg/Makefile
View File

@ -87,7 +87,6 @@ ifeq ($(OPENGL),1)
endif
HAVE_SSA := 1
CFLAGS += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO -DHAVE_FMINF
HAVE_POLL_H = 1
HAVE_GETADDRINFO = 1
HAVE_NETWORK = 1
@ -111,7 +110,6 @@ endif
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
fpic += -mmacosx-version-min=10.1
CFLAGS += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO
HAVE_POLL_H = 1
HAVE_GETADDRINFO = 1
HAVE_NETWORK = 1

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

@ -2,7 +2,7 @@ LIBAVCODEC_SOURCE :=
LIBAVFORMAT_SOURCE :=
LIBAVUTIL_SOURCE :=
DEPS_SOURCE :=
DEFINES := -DHAVE_GMTIME_R -DHAVE_LOCALTIME_R -DHAVE_SWRESAMPLE
DEFINES := -DHAVE_SWRESAMPLE
LIBRETRO_SOURCE :=
GL_SOURCE :=
@ -136,6 +136,14 @@ ifeq ($(HAVE_SSA), 1)
endif
ifeq ($(BAKE_IN_FFMPEG),1)
DEFINES += -DHAVE_GMTIME_R -DHAVE_LOCALTIME_R
ifneq (,$(findstring unix,$(platform)))
DEFINES += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO -DHAVE_FMINF
else ifneq (,$(findstring osx,$(platform)))
DEFINES += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO
endif
include $(CORE_DIR)/Makefile.ffmpeg
endif