Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
TOP = .
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) configure
DIRS := $(DIRS) vendor
DIRS := $(DIRS) ffmpegServerApp
ifeq ($(FFMPEG_EXTERNAL), NO)
DIRS := $(DIRS) vendor
ffmpegServerApp_DEPEND_DIRS += vendor
endif
include $(TOP)/configure/RULES_TOP
14 changes: 9 additions & 5 deletions ffmpegServerApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@ else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
VENDORARCH=win64-dev
endif

# Include the ffmpeg header files
USR_INCLUDES += -I$(TOP)/vendor/ffmpeg-$(VENDORARCH)/include

# build the ffmpeg libs (or stubs on windows) into the binaries
LIB_LIBS += avdevice avformat avcodec swresample swscale avutil
# If we're building ffmpeg ourselves, we need to add the include and library paths
ifeq ($(FFMPEG_EXTERNAL), NO)
USR_INCLUDES += -I$(TOP)/vendor/ffmpeg-$(VENDORARCH)/include
LIB_LIBS += avdevice avformat avcodec swresample swscale avutil
else
# Otherwise, use the system libraries
USR_INCLUDES += -I$(FFMPEG_INCLUDE)
LIB_SYS_LIBS += avdevice avformat avcodec swresample swscale avutil
Comment on lines +44 to +48
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we have a list of these libraries to be shared by ADCore and ffmpegServer? Besides that, LGTM

endif
LIB_LIBS += NDPlugin
LIB_SYS_LIBS_WIN32 += user32

Expand Down