From 15ce5b4ebfe755a266257299967f5248d079de2f Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Mon, 5 Jun 2017 21:54:44 +0200
Subject: [PATCH] Fixed windows compilation

---
 CMakeLists.txt              | 10 +++++-----
 lib/irrlicht/CMakeLists.txt |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8d580528..de235239a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,15 +113,15 @@ if((WIN32 AND NOT MINGW) OR APPLE)
     endif()
 
     # Build png library
-    set (SKIP_INSTALL_ALL TRUE)
-    set (PNG_STATIC TRUE)
-    set (PNG_TESTS FALSE)
-    set (PNG_SHARED FALSE)
+    set(SKIP_INSTALL_ALL TRUE)
+    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
     include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
 
     set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
-    set(PNG_LIBRARY png15_static)
+    set(PNG_LIBRARY png_static)
 endif()
 
 # Add jpeg library
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
index 75869da9f..f32976fd0 100644
--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -6,8 +6,8 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
                     "${JPEG_INCLUDE_DIR}"
                     "${PNG_INCLUDE_DIRS}"
                     "${ZLIB_INCLUDE_DIR}"
-                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
-
+                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/" # For zconf.h on WIN32
+                    "${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
 if (SERVER_ONLY)
     add_definitions(-DNO_IRR_COMPILE_WITH_OPENGL_)
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)