ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7568 from orbea/cleanup 

Makefile.common: Cleanup pt. 2
This commit is contained in:
Twinaphex 2018-11-09 22:01:34 +01:00 committed by GitHub
parent abfacf32e7 6a66ec9e45
commit 43a42d0d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -307,7 +307,6 @@ OBJ += intl/msg_hash_de.o \
intl/msg_hash_cht.o \ intl/msg_hash_cht.o \
intl/msg_hash_ar.o \ intl/msg_hash_ar.o \
intl/msg_hash_el.o intl/msg_hash_el.o
endif endif
ifneq ($(HAVE_GETOPT_LONG), 1) ifneq ($(HAVE_GETOPT_LONG), 1)
@ -512,7 +511,7 @@ ifeq ($(HAVE_LAKKA), 1)
endif endif
# Audio # Audio
#
ifeq ($(HAVE_COREAUDIO), 1) ifeq ($(HAVE_COREAUDIO), 1)
OBJ += audio/drivers/coreaudio.o OBJ += audio/drivers/coreaudio.o
LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit
@ -1755,7 +1754,6 @@ ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/drivers/record_ffmpeg.o \ OBJ += record/drivers/record_ffmpeg.o \
cores/libretro-ffmpeg/ffmpeg_core.o cores/libretro-ffmpeg/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)
DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg