From 1b94fd2fcee9f28d294e3f9620aaf469d2ebda50 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 5 Sep 2016 20:48:27 +0200 Subject: [PATCH] Update libretro-ffmpeg --- cores/libretro-ffmpeg/Makefile | 2 -- cores/libretro-ffmpeg/Makefile.common | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cores/libretro-ffmpeg/Makefile b/cores/libretro-ffmpeg/Makefile index 76da4c464b..bba468a2e1 100644 --- a/cores/libretro-ffmpeg/Makefile +++ b/cores/libretro-ffmpeg/Makefile @@ -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 diff --git a/cores/libretro-ffmpeg/Makefile.common b/cores/libretro-ffmpeg/Makefile.common index 9932555c7a..a213f5b4d6 100644 --- a/cores/libretro-ffmpeg/Makefile.common +++ b/cores/libretro-ffmpeg/Makefile.common @@ -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