Various fixes and activated cmake in travis.

thirdparty/libpng/CMakeLists.txt

@@ -18,7 +18,7 @@ SET(SOURCE
   pngwutil.c )
   
 add_library(png ${SOURCE})
-include_directories(${ZLIB_INCLUDE_DIR})
+include_directories(${ZLIB_INCLUDE_DIRS})
 
 if(operating_system_psp)
     #  -DCHROME_PNG_WRITE_SUPPORT \

thirdparty/unzip/CMakeLists.txt

@@ -5,10 +5,10 @@ SET(SOURCE
     miniunz.c
     unzip.c)
 
-include_directories(${ZLIB_INCLUDE_DIR} ${EXTRA_INCLUDES})
+include_directories(${ZLIB_INCLUDE_DIRS} ${EXTRA_INCLUDES})
 
 add_library(unzip ${SOURCE})
-target_link_libraries(unzip ${ZLIB_LIBRARY})
+target_link_libraries(unzip ${ZLIB_LIBRARIES})
 
 if(PSP OR UNIX)
 	set_target_properties(unzip PROPERTIES COMPILE_FLAGS "-Dunix")