Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Updates precompiled win32 libpng to 1.6.12, built with VC++ 2010, refs #864.

Browse Source 
Removes unused ffmpeg definition from extern_libs4.lua

This was SVN commit r15456.
This commit is contained in:
historic_bruno 2014-06-28 05:34:39 +00:00
parent dd3fdf6800
commit 304a7c1201
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build/premake/extern_libs4.lua
View File

@ -306,23 +306,6 @@ extern_lib_defs = {
end end
end, end,
}, },
ffmpeg = {
compile_settings = function()
if os.is("windows") then
add_default_include_paths("ffmpeg")
end
end,
link_settings = function()
if os.is("windows") then
add_default_lib_paths("ffmpeg")
end
add_default_links({
win_names = { "avcodec-51", "avformat-51", "avutil-49", "swscale-0" },
unix_names = { "avcodec", "avformat", "avutil" },
dbg_suffix = "",
})
end,
},
gloox = { gloox = {
compile_settings = function() compile_settings = function()
if os.is("windows") then if os.is("windows") then
@ -456,7 +439,7 @@ extern_lib_defs = {
add_default_lib_paths("libpng") add_default_lib_paths("libpng")
end end
add_default_links({ add_default_links({
win_names = { "libpng15" }, win_names = { "libpng16" },
unix_names = { "png" }, unix_names = { "png" },
-- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/ -- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/
-- TODO: Figure out why that happens -- TODO: Figure out why that happens