edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

also add includepath if using bundled ffmpeglibs

Browse source
This commit is contained in:
H-M-H 2016-08-31 21:43:31 +02:00 committed by sirius
parent 186938e153
commit 9177259800
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
other/ffmpeg/ffmpeg.lua
View file

@ -1,4 +1,4 @@
FFMPEG = {
ffmpeg = {
basepath = PathDir(ModuleFilename()),
OptFind = function (name, required)
@ -26,22 +26,25 @@ FFMPEG = {
if option.use_pkgconfig then
settings.cc.flags:Add("`pkg-config libavcodec libavformat libavutil libswscale libswresample --cflags`")
settings.link.flags:Add("`pkg-config libavcodec libavformat libavutil libswscale libswresample --libs`")
end
else
settings.cc.includes:Add(ffmpeg.basepath .. "/include")
if platform == "win32" then
settings.link.libpath:Add("other/ffmpeg/windows/lib32")
elseif platform == "win64" then
settings.link.libpath:Add("other/ffmpeg/windows/lib64")
-- elseif platform == "macosx" and not option.use_pkgconfig then
-- settings.link.libpath:Add("other/ffmpeg/mac/lib64")
-- settings.link.flags:Add("-lavcodec -lavformat -lavutil -lswscale -lswresample")
-- elseif platform == "macosx" and string.find(settings.config_name, "64") then
-- client_settings.link.libpath:Add("other/ffmpeg/mac/lib64")
-- elseif platform == "linux" then
-- client_settings.link.libpath:Add("other/ffmpeg/linux/lib64")
-- client_settings.link.libpath:Add("other/ffmpeg/linux/lib32")
if family == "windows" then
if platform == "win32" then
settings.link.libpath:Add("other/ffmpeg/windows/lib32")
elseif platform == "win64" then
settings.link.libpath:Add("other/ffmpeg/windows/lib64")
-- elseif platform == "macosx" and not option.use_pkgconfig then
-- settings.link.libpath:Add("other/ffmpeg/mac/lib64")
-- settings.link.flags:Add("-lavcodec -lavformat -lavutil -lswscale -lswresample")
-- elseif platform == "macosx" and string.find(settings.config_name, "64") then
-- client_settings.link.libpath:Add("other/ffmpeg/mac/lib64")
-- elseif platform == "linux" then
-- client_settings.link.libpath:Add("other/ffmpeg/linux/lib64")
-- client_settings.link.libpath:Add("other/ffmpeg/linux/lib32")
end
end
end
settings.cc.defines:Add("CONF_VIDEORECORDER")
end
-- if option.use_pkgconfig == true then