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

forced libpng to link statically on OS X

This commit is contained in:
Jack Andersen 2015-09-02 18:27:35 -10:00
parent 805dc19d4a
commit fec49c542e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit a16fd798383763b7bb5802b8c4d89ac5d45987e9 Subproject commit 4ffce2dbc3a48ba1fc8142456630d584ab32ec57

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

@ -1,8 +1,8 @@
if(NOT WIN32) if(NOT WIN32 AND NOT APPLE)
find_library(PNG_LIB png) find_library(PNG_LIB png)
endif() endif()
if(WIN32 OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND) if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
message("-- Using HECL's built-in libpng") message("-- Using HECL's built-in libpng")
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIR})
add_library(png add_library(png