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

Buildfix for iOS and Android.

Browse Source
This commit is contained in:
Unknown W. Brackets 2013-05-01 23:31:18 -07:00
parent ae9490ad30
commit c73657e39a
8 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -261,6 +261,8 @@ add_library(Common STATIC
Common/StringUtil.h
Common/Thread.cpp
Common/Thread.h
Common/ThreadPool.cpp
Common/ThreadPool.h
Common/Timer.cpp
Common/Timer.h
Common/Version.cpp)
@ -576,8 +578,11 @@ add_library(native STATIC
native/profiler/profiler.cpp
native/profiler/profiler.h
native/thread/prioritizedworkqueue.cpp
native/thread/prioritizedworkqueue.h
native/thread/threadutil.cpp
native/thread/threadutil.h
native/thread/threadpool.cpp
native/thread/threadpool.h
native/ui/screen.cpp
native/ui/screen.h
native/ui/ui.cpp
@ -904,6 +909,8 @@ add_library(GPU OBJECT
GPU/GLES/StateMapping.h
GPU/GLES/TextureCache.cpp
GPU/GLES/TextureCache.h
GPU/GLES/TextureScaler.cpp
GPU/GLES/TextureScaler.h
GPU/GLES/TransformPipeline.cpp
GPU/GLES/TransformPipeline.h
GPU/GLES/VertexDecoder.cpp

1
Common/CMakeLists.txt
View File

@ -14,6 +14,7 @@ set(SRCS
MsgHandler.cpp
StringUtil.cpp
Thread.cpp
ThreadPool.cpp
Timer.cpp
)

1
GPU/CMakeLists.txt
View File

@ -9,6 +9,7 @@ set(SRCS
GLES/ShaderManager.cpp
GLES/StateMapping.cpp
GLES/TextureCache.cpp
GLES/TextureScaler.cpp
GLES/TransformPipeline.cpp
GLES/VertexDecoder.cpp
GLES/VertexShaderGenerator.cpp

3
GPU/GLES/TextureScaler.cpp
View File

@ -26,6 +26,9 @@
#ifdef __SYMBIAN32__
#define p
#elif defined(IOS)
#include <tr1/functional>
namespace p = std::tr1::placeholders;
#else
namespace p = std::placeholders;
#endif

2
Qt/Common.pro
View File

@ -44,6 +44,7 @@ SOURCES += ../Common/ColorUtil.cpp \
../Common/MsgHandler.cpp \
../Common/StringUtil.cpp \
../Common/Thread.cpp \
../Common/ThreadPool.cpp \
../Common/Timer.cpp \
../Common/Version.cpp \
../Common/Crypto/*.cpp
@ -61,6 +62,7 @@ HEADERS += ../Common/ChunkFile.h \
../Common/MsgHandler.h \
../Common/StringUtil.h \
../Common/Thread.h \
../Common/ThreadPool.h \
../Common/Timer.h \
../Common/Crypto/*.h

1
android/jni/Android.mk
View File

@ -136,6 +136,7 @@ LOCAL_SRC_FILES := \
$(SRC)/Common/FileUtil.cpp \
$(SRC)/Common/StringUtil.cpp \
$(SRC)/Common/Thread.cpp \
$(SRC)/Common/ThreadPool.cpp \
$(SRC)/Common/Timer.cpp \
$(SRC)/Common/Misc.cpp \
$(SRC)/Common/MathUtil.cpp \

2
ext/xbrz/xbrz.h
View File

@ -20,6 +20,8 @@
#ifdef __SYMBIAN32__
#include <libc/sys/config.h>
typedef __uint32_t uint32_t;
#elif defined(IOS)
#include <stdint.h>
#else
#include <cstdint> //uint32_t
#endif

2
native

@ -1 +1 @@
Subproject commit eb3c3cd21742f9a168f485930592194a144ade8e
Subproject commit 8d7fd418387451dd5f4140374959519c09b75a47