FFmpeg as well. Small fixup.

This commit is contained in:
Themaister 2011-08-19 19:16:53 +02:00
parent 1fe83ab25a
commit e133662346
2 changed files with 9 additions and 2 deletions

View File

@ -107,13 +107,13 @@ endif
ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32
DEFINES += -DHAVE_DINPUT -Iffmpeg
DEFINES += -DHAVE_DINPUT
OBJ += input/dinput.o
endif
ifeq ($(HAVE_FFMPEG), 1)
LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lzlib1
DEFINES += -DHAVE_FFMPEG
DEFINES += -DHAVE_FFMPEG -Iffmpeg
OBJ += record/ffemu.o
endif

View File

@ -18,6 +18,7 @@ HAVE_NETPLAY = 1
HAVE_FBO = 1
HAVE_CG = 0
HAVE_PYTHON = 0
HAVE_FFMPEG = 1
libsnes ?= -lsnes
LIBS = -lm
@ -104,6 +105,12 @@ ifeq ($(HAVE_DINPUT), 1)
OBJ += input/dinput.o
endif
ifeq ($(HAVE_FFMPEG), 1)
LIBS += -lavformat -lavcodec -lavutil -lswscale
DEFINES += -DHAVE_FFMPEG -Iffmpeg
OBJ += record/ffemu.o
endif
ifneq ($(V),1)
Q := @