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

Move more to Makefile.common

This commit is contained in:
twinaphex 2014-09-14 04:43:18 +02:00
parent a59c9247ed
commit 6a730a7408
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -36,11 +36,6 @@ RETROLAUNCH_OBJ = tools/retrolaunch/main.o \
HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h) HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
ifeq ($(REENTRANT_TEST), 1)
DEFINES += -Dmain=retroarch_main
OBJ += console/test.o
endif
ifeq ($(HAVE_DYLIB), 1) ifeq ($(HAVE_DYLIB), 1)
LIBS += $(DYLIB_LIB) LIBS += $(DYLIB_LIB)
endif endif
@ -60,12 +55,6 @@ ifeq ($(HAVE_ZLIB), 1)
DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB
endif endif
ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/ffmpeg.o
LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS)
DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
endif
ifeq ($(HAVE_DYNAMIC), 1) ifeq ($(HAVE_DYNAMIC), 1)
LIBS += $(DYLIB_LIB) LIBS += $(DYLIB_LIB)
else else

15
Makefile.common
View File

@ -31,6 +31,11 @@ ifeq ($(TDM_GCC),)
LDCXXFLAGS += -static-libstdc++ LDCXXFLAGS += -static-libstdc++
endif endif
ifeq ($(REENTRANT_TEST), 1)
DEFINES += -Dmain=retroarch_main
OBJ += console/test.o
endif
# System # System
ifneq ($(findstring BSD,$(OS)),) ifneq ($(findstring BSD,$(OS)),)
@ -127,7 +132,6 @@ OBJ += frontend/frontend.o \
ifeq ($(HAVE_STDIN_CMD), 1) ifeq ($(HAVE_STDIN_CMD), 1)
DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
OBJ += command.o
endif endif
ifeq ($(HAVE_PYTHON), 1) ifeq ($(HAVE_PYTHON), 1)
@ -525,3 +529,12 @@ ifneq ($(findstring Win32,$(OS)),)
OBJ += media/rarch.o \ OBJ += media/rarch.o \
gfx/context/win32_common.o gfx/context/win32_common.o
endif endif
# Record
ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/ffmpeg.o
LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(FFMPEG_LIBS)
DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
DEFINES += -DHAVE_FFMPEG -Iffmpeg
endif

12
Makefile.win
View File

@ -50,6 +50,12 @@ RSOUND_LIBS := -lrsound
PYTHON_LIBS := -lpython32 PYTHON_LIBS := -lpython32
PYTHON_CFLAGS := -DHAVE_PYTHON -Ipython PYTHON_CFLAGS := -DHAVE_PYTHON -Ipython
AVCODEC_LIBS := -lavcodec
AVUTIL_LIBS := -lavutil
SWSCALE_LIBS := -lswscale
AVFORMAT_LIBS := -lavformat
FFMPEG_LIBS := -lws2_32 -lz
OBJDIR := obj-w32 OBJDIR := obj-w32
OS := Win32 OS := Win32
@ -109,12 +115,6 @@ else
LIBS += $(libretro) LIBS += $(libretro)
endif endif
ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/ffmpeg.o
LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz
DEFINES += -DHAVE_FFMPEG -Iffmpeg
endif
ifneq ($(V), 1) ifneq ($(V), 1)
Q := @ Q := @
endif endif