Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use microHTTPd instead of nullhttpd #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use microHTTPd instead of nullhttpd #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ffmpegServerApp/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ endif

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


+ffmpegServer_SYS_LIBS += microhttpd
# build the ffmpeg libs (or stubs on windows) into the binaries
LIB_LIBS += avdevice avformat avcodec swresample swscale avutil
LIB_LIBS += NDPlugin
LIB_SYS_LIBS_WIN32 += user32

# The following are compiled and added to the support library
ffmpegServer_SRCS += ffmpegCommon.cpp
ffmpegServer_SRCS += ffmpegServer.cpp nullhttpd_server.c nullhttpd_http.c nullhttpd_format.c nullhttpd_win32.c
ffmpegServer_SRCS += ffmpegServer.cpp
ffmpegServer_SRCS += ffmpegFile.cpp

include $(ADCORE)/ADApp/commonLibraryMakefile
Expand Down
Loading