Update CMakeLists.txt

restored cmake

CMakeLists.txt

@@ -142,13 +142,22 @@ endif(WIN32)
 
 #add png library
 if (OX_HAVE_LIBPNG)
-	find_package(PNG REQUIRED)
-	set (CORE_LIBS
+
+	set(LIBPNG ${libprefix}png)
+
+	if (MSVC)
+		if (MSVC_VERSION EQUAL "1900")
+			set(LIBPNG ${LIBPNG}-2015)
+		endif()
+	endif()	
+
+	set(CORE_LIBS
 		${CORE_LIBS}
-		${PNG_LIBRARY}
-	)
-endif(OX_HAVE_LIBPNG)
+		${LIBPNG})
 
+	set(OX_DEFINITIONS	${OX_DEFINITIONS}
+		-DOX_HAVE_LIBPNG)
+endif(OX_HAVE_LIBPNG)
 
 #add z library
 if (EMSCRIPTEN)
@@ -168,11 +177,19 @@ endif(EMSCRIPTEN)
 
 #add jpeg library
 if (OX_HAVE_LIBJPEG)
-	find_package(JPEG REQUIRED)
-	set (CORE_LIBS
+	set(LIBJPEG ${libprefix}jpeg)
+
+	if (MSVC)
+		if (MSVC_VERSION EQUAL "1900")
+			set(LIBJPEG ${LIBJPEG}-2015)
+		endif()	
+	endif()	
+
+	set(OX_DEFINITIONS	${OX_DEFINITIONS}
+		-DOX_HAVE_LIBJPEG)
+	set(CORE_LIBS
 		${CORE_LIBS}
-		${JPEG_LIBRARY}
-	)
+		${LIBJPEG})
 endif(OX_HAVE_LIBJPEG)
 
 
@@ -210,4 +227,3 @@ set(OXYGINE_JS_LIBRARIES
 set(CMAKE_INSTALL_PREFIX ../libs)
 install(TARGETS oxygine-framework CONFIGURATIONS Debug DESTINATION ./debug)
 install(TARGETS oxygine-framework CONFIGURATIONS Release DESTINATION ./release)
-