AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restored system libpng

This commit is contained in:
Jack Andersen 2015-11-22 13:50:11 -10:00
parent 2c7df0b4de
commit a443b6df73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hecl/extern/libpng/CMakeLists.txt vendored
View File

@ -2,7 +2,7 @@ if(NOT WIN32 AND NOT APPLE)
find_library(PNG_LIB png) find_library(PNG_LIB png)
endif() endif()
#if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND) if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
message(STATUS "Using HECL's built-in libpng") message(STATUS "Using HECL's built-in libpng")
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIR})
add_library(png add_library(png
@ -33,6 +33,6 @@ add_library(png
set(PNG_LIB png CACHE PATH "PNG library" FORCE) set(PNG_LIB png CACHE PATH "PNG library" FORCE)
set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE) set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE)
#else() else()
#find_path(LIBPNG_INCLUDE_DIR png.h) find_path(LIBPNG_INCLUDE_DIR png.h)
#endif() endif()