Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Missed changes from 304a7c1201

Browse Source 
This was SVN commit r15458.
This commit is contained in:
historic_bruno 2014-06-28 05:50:32 +00:00
parent 6bec648833
commit 59b2493990
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/premake/premake4.lua
View File

@ -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

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

@ -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