diff --git a/build/premake/premake4.lua b/build/premake/premake4.lua index 6839aa672f..ef0026e0ee 100644 --- a/build/premake/premake4.lua +++ b/build/premake/premake4.lua @@ -1112,7 +1112,6 @@ function setup_atlas_projects() atlas_extern_libs = { "boost", "comsuppw", - --"ffmpeg", -- disabled for now because it causes too many build difficulties "iconv", "libxml2", "sdl", -- key definitions diff --git a/source/lib/external_libraries/png.h b/source/lib/external_libraries/png.h index cf01765ef0..f91645c076 100644 --- a/source/lib/external_libraries/png.h +++ b/source/lib/external_libraries/png.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Wildfire Games +/* Copyright (c) 2014 Wildfire Games * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -35,9 +35,9 @@ // automatically link against the required library #if MSC_VERSION # ifdef NDEBUG -# pragma comment(lib, "libpng15.lib") +# pragma comment(lib, "libpng16.lib") # else -# pragma comment(lib, "libpng15d.lib") +# pragma comment(lib, "libpng16d.lib") # endif // NDEBUG #endif // MSC_VERSION