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 Packages Projects Releases Wiki Activity

Some Mac build fixes from vit9696 and some more. Update submodules.

Browse Source
This commit is contained in:
Henrik Rydgård 2013-05-07 00:08:57 +02:00
parent 7957cff30b
commit d8f9790abc
8 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -112,8 +112,6 @@ endif()
if(PANDORA) if(PANDORA)
add_definitions(-DPANDORA) add_definitions(-DPANDORA)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto -fuse-linker-plugin")
add_definitions(-mcpu=cortex-a8 -march=armv7-a -mfpu=neon -mfloat-abi=softfp -ftree-vectorize -mno-unaligned-access)
endif() endif()
if(ARM) if(ARM)
@ -157,8 +155,9 @@ if(NOT MSVC)
if(IOS) if(IOS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
elseif(APPLE) elseif(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=10.7") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__")
# Karen/angelXwind: --macosx-version-min=10.7 is needed in order to produce binaries that OS X 10.7 Lion can execute. However, it seems that PPSSPP won't support 10.6 or lower without getting rid of -stdlib=libc++ ...which probably won't end well. So I guess PPSSPP will strictly be a 10.7+ app. # Karen/angelXwind: --macosx-version-min=10.7 is needed in order to produce binaries that OS X 10.7 Lion can execute. However, it seems that PPSSPP won't support 10.6 or lower without getting rid of -stdlib=libc++ ...which probably won't end well. So I guess PPSSPP will strictly be a 10.7+ app.
# vit9696: OSX 10.6 builds are possible: http://forums.ppsspp.org/showthread.php?tid=1826&pid=18875#pid18875
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
endif() endif()
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0) if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0)

4
Common/ChunkFile.h
View File

@ -34,7 +34,7 @@
#include <list> #include <list>
#include <set> #include <set>
#ifndef __SYMBIAN32__ #ifndef __SYMBIAN32__
#if defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) #if defined(IOS) || defined(MACGNUSTD)
#include <tr1/type_traits> #include <tr1/type_traits>
#else #else
#include <type_traits> #include <type_traits>
@ -45,7 +45,7 @@
#include "FileUtil.h" #include "FileUtil.h"
#include "../ext/snappy/snappy-c.h" #include "../ext/snappy/snappy-c.h"
#if defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) #if defined(IOS) || defined(MACGNUSTD)
namespace std { namespace std {
using tr1::is_pointer; using tr1::is_pointer;
} }

4
Common/StdMutex.h
View File

@ -6,9 +6,9 @@
#define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
// Note: __MAC_10_7 is defined on 10.7+. // Note: __MAC_10_7 is defined on 10.7+.
#if (GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ || defined(__MAC_10_7)) \ #if (GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ || defined(__APPLE__)) \
/* GCC 4.4 provides <mutex>, except on these platforms: */ \ /* GCC 4.4 provides <mutex>, except on these platforms: */ \
&& !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(IOS) && !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MACGNUSTD)
#include <mutex> #include <mutex>
#else #else

7
Core/HLE/sceAtrac.cpp
View File

@ -84,10 +84,9 @@ struct AtracLoopInfo {
}; };
struct Atrac { struct Atrac {
Atrac() : decodePos(0), decodeEnd(0), loopNum(0), atracChannels(2), Atrac() : atracID(-1), data_buf(0), decodePos(0), decodeEnd(0), atracChannels(2), atracOutputChannels(2), loopNum(0),
atracBitrate(64), atracBytesPerFrame(0), atracBufSize(0), currentSample(0), atracBitrate(64), atracBytesPerFrame(0), atracBufSize(0),
endSample(-1), loopinfoNum(0), firstSampleoffset(0), data_buf(0), currentSample(0), endSample(-1), firstSampleoffset(0), loopinfoNum(0) {
atracOutputChannels(2), atracID(-1) {
memset(&first, 0, sizeof(first)); memset(&first, 0, sizeof(first));
memset(&second, 0, sizeof(second)); memset(&second, 0, sizeof(second));
#ifdef USE_FFMPEG #ifdef USE_FFMPEG

2
GPU/GLES/TextureCache.cpp
View File

@ -743,7 +743,7 @@ static inline u32 QuickTexHash(u32 addr, int bufw, int w, int h, u32 format) {
#ifdef _M_SSE #ifdef _M_SSE
// Make sure both the size and start are aligned, OR will get either. // Make sure both the size and start are aligned, OR will get either.
if ((((u32)checkp | sizeInRAM) & 0xf) == 0) { if ((((u32)(intptr_t)checkp | sizeInRAM) & 0xf) == 0) {
__m128i cursor = _mm_set1_epi32(0); __m128i cursor = _mm_set1_epi32(0);
const __m128i *p = (const __m128i *)checkp; const __m128i *p = (const __m128i *)checkp;
for (u32 i = 0; i < sizeInRAM / 16; ++i) { for (u32 i = 0; i < sizeInRAM / 16; ++i) {

2
ffmpeg

@ -1 +1 @@
Subproject commit 5062ce9acc4036c0a015219c9c19761b86110aba Subproject commit b29d7591c84ced898da8c2fe66cad41cbac13210

2
lang

@ -1 +1 @@
Subproject commit a8d260acb367e922c7f4792ab134c8a02052c854 Subproject commit 69c53c982b27a588fafc636bac3083a9ac1df5f5

2
native

@ -1 +1 @@
Subproject commit 30802a1120b9c2d9a4e4d17d2b1a539e9684332c Subproject commit f9ab24cb3de114f05769267fd7c3e50882eaa5af