mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 03:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Griffin) Update Griffin

Browse Source
This commit is contained in:
twinaphex 2015-06-21 00:37:19 +02:00
parent e635f9fa59
commit c13b98da8a
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -797,7 +797,7 @@ endif
# Record # Record
ifeq ($(HAVE_FFMPEG), 1) ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/drivers/ffmpeg.o \ OBJ += record/drivers/record_ffmpeg.o \
cores/ffmpeg_core.o cores/ffmpeg_core.o
LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS) LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS) DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)

14
griffin/griffin.c
View File

@ -548,10 +548,17 @@ DYNAMIC
============================================================ */ ============================================================ */
#include "../libretro-common/dynamic/dylib.c" #include "../libretro-common/dynamic/dylib.c"
#include "../dynamic.c" #include "../dynamic.c"
#include "../cores/dynamic_dummy.c"
#include "../gfx/video_filter.c" #include "../gfx/video_filter.c"
#include "../audio/audio_dsp_filter.c" #include "../audio/audio_dsp_filter.c"
/*============================================================
CORES
============================================================ */
#ifdef HAVE_FFMPEG
#include "../cores/ffmpeg_core.c"
#endif
#include "../cores/dynamic_dummy.c"
/*============================================================ /*============================================================
FILE FILE
@ -658,6 +665,7 @@ RETROARCH
#include "../runloop.c" #include "../runloop.c"
#include "../runloop_data.c" #include "../runloop_data.c"
/*============================================================ /*============================================================
RECORDING RECORDING
============================================================ */ ============================================================ */
@ -665,6 +673,10 @@ RECORDING
#include "../record/record_driver.c" #include "../record/record_driver.c"
#include "../record/drivers/record_null.c" #include "../record/drivers/record_null.c"
#ifdef HAVE_FFMPEG
#include "../record/drivers/record_ffmpeg.c"
#endif
/*============================================================ /*============================================================
THREAD THREAD
============================================================ */ ============================================================ */

0
record/drivers/ffmpeg.c → record/drivers/record_ffmpeg.c
View File