Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use libpng to load PNGs. Fixes #4689.

Browse Source
This commit is contained in:
Sacha 2013-12-08 01:42:17 +10:00
parent 0c413d118d
commit 6ea758db67
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -557,6 +557,37 @@ target_link_libraries(libzip ${ZLIB_LIBRARY})
include_directories(native/ext/libzip)
set(LIBZIP_LIBRARY libzip)
if (BLACKBERRY)
set(LIBPNG_LIBRARY png)
else()
add_library(png16 STATIC
native/ext/libpng16/pngconf.h
native/ext/libpng16/pngdebug.h
native/ext/libpng16/png.c
native/ext/libpng16/png.h
native/ext/libpng16/pngerror.c
native/ext/libpng16/pngget.c
native/ext/libpng16/pnginfo.h
native/ext/libpng16/pnglibconf.h
native/ext/libpng16/pngmem.c
native/ext/libpng16/pngpread.c
native/ext/libpng16/pngpriv.h
native/ext/libpng16/pngread.c
native/ext/libpng16/pngrio.c
native/ext/libpng16/pngrtran.c
native/ext/libpng16/pngrutil.c
native/ext/libpng16/pngset.c
native/ext/libpng16/pngstruct.h
native/ext/libpng16/pngtest.c
native/ext/libpng16/pngtrans.c
native/ext/libpng16/pngwio.c
native/ext/libpng16/pngwrite.c
native/ext/libpng16/pngwtran.c
native/ext/libpng16/pngwutil.c)
set(LIBPNG_LIBRARY png16)
include_directories(native/ext/libpng16)
endif()
set(nativeExtra)
set(nativeExtraLibs)
if(ANDROID)
@ -598,7 +629,7 @@ elseif(USING_QT_UI)
endif()
elseif(BLACKBERRY)
set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp native/base/BlackberryDisplay.cpp)
set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL png)
set(nativeExtraLibs ${nativeExtraLibs} OpenAL bps screen socket EGL)
set(TargetBin PPSSPPBlackberry)
elseif(SDL_FOUND)
set(TargetBin PPSSPPSDL)
@ -783,7 +814,7 @@ add_library(native STATIC
native/ext/jpge/jpge.cpp
native/ext/jpge/jpge.h)
include_directories(native)
target_link_libraries(native ${LIBZIP_LIBRARY} rg_etc1 vjson stb_image stb_vorbis snappy ${GLEW_LIBRARIES})
target_link_libraries(native ${LIBZIP_LIBRARY} ${LIBPNG_LIBRARY} rg_etc1 vjson stb_image stb_vorbis snappy ${GLEW_LIBRARIES})
if(ANDROID)
target_link_libraries(native log)

6
Qt/Native.pro
View File

@ -69,6 +69,12 @@ win32|contains(QT_CONFIG, no-zlib) {
SOURCES += $$P/native/ext/libzip/*.c
HEADERS += $$P/native/ext/libzip/*.h
# Libpng
SOURCES += $$P/native/ext/libpng16/*.c
HEADERS += $$P/native/ext/libpng16/*.h
INCLUDEPATH += $$P/native/ext/libpng16
# Native
SOURCES += $$P/native/audio/*.cpp \

2
native

@ -1 +1 @@
Subproject commit 4e2212de407cafb175091fce0e236dfaaa9d4226
Subproject commit 64b5146718c768818c6819057d00712acf31631e