diff --git a/CMakeLists.txt b/CMakeLists.txt index b85ea12643..c1f97ff0e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1891,8 +1891,8 @@ if(IOS) set(APP_DIR_NAME "$") endif() add_custom_command(TARGET PPSSPP POST_BUILD - COMMAND mkdir -p ${APP_DIR_NAME} - COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C ${APP_DIR_NAME} + COMMAND mkdir -p \"${APP_DIR_NAME}\" + COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" ) set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" diff --git a/ext/native/profiler/profiler.cpp b/ext/native/profiler/profiler.cpp index 35e270b477..bf037a9510 100644 --- a/ext/native/profiler/profiler.cpp +++ b/ext/native/profiler/profiler.cpp @@ -11,11 +11,17 @@ #include "base/logging.h" #include "base/timeutil.h" #include "gfx_es2/draw_buffer.h" +#include "ppsspp_config.h" #include "profiler/profiler.h" #define MAX_CATEGORIES 64 // Can be any number, represents max profiled names. #define MAX_DEPTH 16 // Can be any number, represents max nesting depth of profiled names. +#if PPSSPP_PLATFORM(IOS) && defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0 +// iOS did not support C++ thread_local before iOS 9 +#define MAX_THREADS 1 // Can be any number, represents concurrent threads calling the profiler. +#else #define MAX_THREADS 4 // Can be any number, represents concurrent threads calling the profiler. +#endif #define HISTORY_SIZE 128 // Must be power of 2 #ifndef _DEBUG