All your codebase are belong to us.

2014-08-22 00:15:09 -04:00
parent 2a64c07215
commit 948ebe5213
110 changed files with 661 additions and 611 deletions
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -9,7 +9,11 @@ if (STANDALONE)
 else (STANDALONE)
  use_prebuilt_binary(libpng)
  if (WINDOWS)
-    set(PNG_LIBRARIES libpng15)
+    if(MSVC12)
+      set(PNG_LIBRARIES libpng16)
+    else(MSVC12)
+      set(PNG_LIBRARIES libpng15)
+    endif(MSVC12)
  elseif(DARWIN)
    set(PNG_LIBRARIES png15)
  else(LINUX)