all repos — mgba @ 3d8a3e8cbcf95f05247067905a296d91b0c64067

mGBA Game Boy Advance Emulator

PSP2: Use libpng since we already have it
Jeffrey Pfau jeffrey@endrift.com
Sun, 30 Aug 2015 19:15:27 -0700
commit

3d8a3e8cbcf95f05247067905a296d91b0c64067

parent

a8192f47e2ae22d244835ecf433aaeec003d340c

1 files changed, 8 insertions(+), 4 deletions(-)

jump to
M CMakeLists.txtCMakeLists.txt

@@ -286,7 +286,9 @@ set(BUILD_GLES2 OFF CACHE BOOL "OpenGL|ES 2 not found" FORCE)

endif() endif() find_feature(USE_FFMPEG "libavcodec;libavformat;libavresample;libavutil;libswscale") -find_feature(USE_PNG "ZLIB;PNG") +if(NOT PSP2) + find_feature(USE_PNG "ZLIB;PNG") +endif() find_feature(USE_LIBZIP "libzip") find_feature(USE_MAGICK "MagickWand")

@@ -366,9 +368,11 @@ endif()

if(USE_PNG) list(APPEND FEATURES PNG) - include_directories(AFTER ${PNG_INCLUDE_DIRS}) - list(APPEND DEPENDENCY_LIB ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpng12-0,zlib1g") + if(NOT PSP2) + include_directories(AFTER ${PNG_INCLUDE_DIRS}) + list(APPEND DEPENDENCY_LIB ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpng12-0,zlib1g") + endif() endif() if(USE_LIBZIP)