Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-13 10:24:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Proper fix for libpng16 includes.

Browse Source 
Improve Blackberry CMake toolchain.
This commit is contained in:
Sacha 2013-12-10 02:14:43 +10:00
parent f6482417ab
commit 2387509896
9 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Blackberry/bb.toolchain.cmake
View File

@ -1,13 +1,21 @@
# Standard settings
set (CMAKE_SYSTEM_NAME QNX)
set (CMAKE_SYSTEM_VERSION 1)
set (CMAKE_PREFIX_PATH $ENV{QNX_TARGET}/usr)
set (CMAKE_INCLUDE_PATH $ENV{QNX_TARGET}/usr/include)
if (SIMULATOR)
set (CMAKE_SYSTEM_PROCESSOR x86)
set (CMAKE_LIBRARY_PATH $ENV{QNX_TARGET}/x86 $ENV{QNX_TARGET}/x86/usr)
else()
set (CMAKE_SYSTEM_PROCESSOR armv7)
set (CMAKE_LIBRARY_PATH $ENV{QNX_TARGET}/armle-v7 $ENV{QNX_TARGET}/armle-v7/usr)
endif()
set (UNIX True)
set (CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_LIBRARY_PATH} CACHE string "Blackberry find search path root")
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
include (CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-gcc nto${CMAKE_SYSTEM_PROCESSOR}-gcc)
CMAKE_FORCE_CXX_COMPILER (nto${CMAKE_SYSTEM_PROCESSOR}-g++ nto${CMAKE_SYSTEM_PROCESSOR}-g++)

16
CMakeLists.txt
View File

@ -552,8 +552,14 @@ target_link_libraries(libzip ${ZLIB_LIBRARY})
include_directories(native/ext/libzip)
set(LIBZIP_LIBRARY libzip)
if (BLACKBERRY)
set(LIBPNG_LIBRARY png)
# FindPNG does a few things we don't want. So do it ourselves.
# Fixed to libpng16, otherwise it can pick up earlier even if newer exists.
find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng16/png.h")
find_library(PNG_LIBRARY NAMES png16 libpng16 )
find_package(PackageHandleStandardArgs)
find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
if (PNG_FOUND)
include_directories(${PNG_PNG_INCLUDE_DIR})
else()
add_library(png16 STATIC
native/ext/libpng16/pngconf.h
@ -579,8 +585,8 @@ else()
native/ext/libpng16/pngwrite.c
native/ext/libpng16/pngwtran.c
native/ext/libpng16/pngwutil.c)
set(LIBPNG_LIBRARY png16)
include_directories(native/ext/libpng16)
set(PNG_LIBRARY png16)
include_directories(native/ext)
endif()
set(nativeExtra)
@ -809,7 +815,7 @@ add_library(native STATIC
native/ext/jpge/jpge.cpp
native/ext/jpge/jpge.h)
include_directories(native)
target_link_libraries(native ${LIBZIP_LIBRARY} ${LIBPNG_LIBRARY} rg_etc1 vjson stb_vorbis snappy ${GLEW_LIBRARIES})
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARY} rg_etc1 vjson stb_vorbis snappy ${GLEW_LIBRARIES})
if(ANDROID)
target_link_libraries(native log)

2
Qt/Native.pro
View File

@ -61,7 +61,7 @@ HEADERS += $$P/native/ext/libzip/*.h
# Libpng
SOURCES += $$P/native/ext/libpng16/*.c
HEADERS += $$P/native/ext/libpng16/*.h
INCLUDEPATH += $$P/native/ext/libpng16
INCLUDEPATH += $$P/native/ext
# Native

2
Qt/PPSSPP.pro
View File

@ -88,7 +88,7 @@ SOURCES += $$P/UI/*Screen.cpp \
$$P/android/jni/TestRunner.cpp
HEADERS += $$P/UI/*.h
INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext/libpng16
INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext
# Use forms UI for desktop platforms
!mobile_platform {

2
Qt/QtHost.cpp
View File

@ -4,7 +4,7 @@
#include <QDebug>
#include <QDir>
#include <QCoreApplication>
#include <png.h>
#include <libpng16/png.h>
#include "QtHost.h"
#include "LogManager.h"

2
UI/NativeApp.cpp
View File

@ -29,7 +29,7 @@
#include <locale.h>
#ifdef _WIN32
#include <png.h>
#include <libpng16/png.h>
#include "ext/jpge/jpge.h"
#endif

8
UI/UI.vcxproj
View File

@ -115,7 +115,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext/libpng16</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@ -132,7 +132,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext/libpng16</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
@ -151,7 +151,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext/libpng16</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -173,7 +173,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext/libpng16</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib;../native/ext</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>false</RuntimeTypeInfo>

2
android/jni/Locals.mk
View File

@ -8,8 +8,8 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../Common \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/$(NATIVE)/base \
$(LOCAL_PATH)/$(NATIVE)/ext \
$(LOCAL_PATH)/$(NATIVE)/ext/libzip \
$(LOCAL_PATH)/$(NATIVE)/ext/libpng16 \
$(LOCAL_PATH)/$(NATIVE) \
$(LOCAL_PATH)

2
native

@ -1 +1 @@
Subproject commit 7e2b9d7e98629ea6ef23c7a4e49832e3cd4a6303
Subproject commit 9a66b6e803f66db69864ad439b776e3f6c68aa98