phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Updates bundled libpng to v1.5.13, built with VC2008 - requires update-workspaces. Refs #864

Browse Source 
This was SVN commit r13035.
This commit is contained in:
historic_bruno 2013-01-03 17:22:14 +00:00
parent 276f0a41a0
commit d65c7751a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/premake/extern_libs4.lua
View File

@ -370,7 +370,7 @@ extern_lib_defs = {
add_default_lib_paths("libpng") add_default_lib_paths("libpng")
end end
add_default_links({ add_default_links({
win_names = { "libpng14" }, win_names = { "libpng15" },
unix_names = { "png" }, unix_names = { "png" },
}) })
end, end,

6
source/lib/external_libraries/png.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010 Wildfire Games /* Copyright (c) 2013 Wildfire Games
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
@ -35,9 +35,9 @@
// automatically link against the required library // automatically link against the required library
#if MSC_VERSION #if MSC_VERSION
# ifdef NDEBUG # ifdef NDEBUG
# pragma comment(lib, "libpng14.lib") # pragma comment(lib, "libpng15.lib")
# else # else
# pragma comment(lib, "libpng14d.lib") # pragma comment(lib, "libpng15d.lib")
# endif // NDEBUG # endif // NDEBUG
#endif // MSC_VERSION #endif // MSC_VERSION