PSP2: Let PSP2 find its packages if in portlibs
Jeffrey Pfau jeffrey@endrift.com
Tue, 22 Sep 2015 21:08:06 -0700
2 files changed,
5 insertions(+),
4 deletions(-)
M
CMakeLists.txt
→
CMakeLists.txt
@@ -277,11 +277,11 @@ endif()
endif() set(WANT_ZLIB ${USE_ZLIB}) set(WANT_PNG ${USE_PNG}) +set(WANT_LIBZIP ${USE_LIBZIP}) + find_feature(USE_FFMPEG "libavcodec;libavformat;libavresample;libavutil;libswscale") -if(NOT PSP2) - find_feature(USE_ZLIB "ZLIB") - find_feature(USE_PNG "PNG") -endif() +find_feature(USE_ZLIB "ZLIB") +find_feature(USE_PNG "PNG") find_feature(USE_LIBZIP "libzip") find_feature(USE_MAGICK "MagickWand")
M
src/platform/psp2/CMakeToolchain.vitasdk
→
src/platform/psp2/CMakeToolchain.vitasdk
@@ -34,6 +34,7 @@ set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")
set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags") set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared link flags") +set(CMAKE_PREFIX_PATH ${VITASDK}/arm-vita-eabi) set(PKG_CONFIG_EXECUTABLE "/dev/null" CACHE INTERNAL "" FORCE) set(PSP2 ON)