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

MacOSX buildfixes

Browse Source
This commit is contained in:
Henrik Rydgård 2023-06-17 13:48:49 +02:00
parent f6fdaa4f56
commit 8beca03e7e
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1416,6 +1416,10 @@ list(APPEND NativeAppSource
UI/CustomButtonMappingScreen.cpp
UI/Theme.h
UI/Theme.cpp
UI/RetroAchievements.cpp
UI/RetroAchievements.h
UI/RetroAchievementScreens.cpp
UI/RetroAchievementScreens.h
)
if(ANDROID)
@ -2212,7 +2216,7 @@ else()
include_directories(ext/zstd/lib)
endif()
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash ${GlslangLibs}
target_link_libraries(${CoreLibName} Common native kirk cityhash sfmt19937 xbrz xxhash rcheevos ${GlslangLibs}
${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
target_compile_features(${CoreLibName} PUBLIC cxx_std_17)

2
Common/File/Path.h
View File

@ -92,7 +92,7 @@ public:
std::wstring ToWString() const;
std::string ToCString() const; // Flips the slashes back to Windows standard, but string still UTF-8.
#else
std::string ToCSTring() const {
std::string ToCString() const {
return ToString();
}
#endif

2
UI/RetroAchievements.cpp
View File

@ -108,7 +108,7 @@ void OSDOpenBackgroundProgressDialog(const char *str_id, std::string message, s3
NOTICE_LOG(ACHIEVEMENTS, "Progress dialog opened: %s %s", str_id, message.c_str());
}
void OSDUpdateBackgroundProgressDialog(const char *str_id, std::string message, s32 min, s32 max, s32 value) {
NOTICE_LOG(ACHIEVEMENTS, "Progress dialog updated: %s %s %f/(%f->%f)", str_id, message.c_str(), value, min, max);
NOTICE_LOG(ACHIEVEMENTS, "Progress dialog updated: %s %s %d/(%d->%d)", str_id, message.c_str(), value, min, max);
}
void OSDCloseBackgroundProgressDialog(const char *str_id) {
NOTICE_LOG(ACHIEVEMENTS, "Progress dialog closed: %s", str_id);

5
UI/RetroAchievements.h
View File

@ -17,9 +17,6 @@
#include <vector>
#include <mutex>
#define ALWAYS_INLINE __forceinline
class Path;
class PointerWrap;
@ -74,7 +71,7 @@ bool IsUsingRAIntegration();
#else
static ALWAYS_INLINE bool IsUsingRAIntegration()
static inline bool IsUsingRAIntegration()
{
return false;
}

1
ext/CMakeLists.txt
View File

@ -30,6 +30,7 @@ add_subdirectory(glslang EXCLUDE_FROM_ALL)
add_subdirectory(snappy)
add_subdirectory(udis86)
add_subdirectory(SPIRV-Cross-build)
add_subdirectory(rcheevos-build)
if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO)
add_subdirectory(discord-rpc-build)
endif()

1
ext/rcheevos-build/CMakeLists.txt
View File

@ -44,4 +44,5 @@ set(ALL_SOURCE_FILES
add_library(rcheevos STATIC ${ALL_SOURCE_FILES})
target_compile_definitions(rcheevos PUBLIC RC_DISABLE_LUA)
target_include_directories(rcheevos PUBLIC ../rcheevos/include ../rcheevos/src/rapi)