Skip to content

Commit

Permalink
Merge pull request #18643 from hrydgard/update-rcheevos
Browse files Browse the repository at this point in the history 
Update rcheevos submodule
  • Loading branch information
@hrydgard
hrydgard committed Jan 14, 2024
2 parents 3bd2b1c + 096131d commit 80547c5
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Core/RetroAchievements.h
View file
Expand Up @@ -21,12 +21,12 @@
#include "Common/CommonTypes.h"
#include "Core/Loaders.h" // for IdentifiedFileType

#include "ext/rcheevos/include/rc_client.h"

class Path;
class PointerWrap;
class FileLoader;

struct rc_client_t;

namespace Achievements {

struct Statistics {
Expand Down
2 changes: 2 additions & 0 deletions UI/RetroAchievementScreens.h
View file
Expand Up @@ -10,6 +10,8 @@
#include "UI/MiscScreens.h"
#include "UI/TabbedDialogScreen.h"

#include "ext/rcheevos/include/rc_client.h"

// Lists the achievements and leaderboards for one game.
class RetroAchievementsListScreen : public TabbedUIDialogScreenWithGameBackground {
public:
Expand Down
2 changes: 1 addition & 1 deletion UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
View file
Expand Up @@ -40,10 +40,10 @@
<ClInclude Include="..\..\ext\rcheevos\include\rc_runtime.h" />
<ClInclude Include="..\..\ext\rcheevos\include\rc_runtime_types.h" />
<ClInclude Include="..\..\ext\rcheevos\include\rc_url.h" />
<ClInclude Include="..\..\ext\rcheevos\include\rc_util.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rapi\rc_api_common.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rc_client_internal.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rc_compat.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rc_util.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rc_version.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rcheevos\rc_internal.h" />
<ClInclude Include="..\..\ext\rcheevos\src\rcheevos\rc_validate.h" />
Expand Down
4 changes: 2 additions & 2 deletions UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
View file
Expand Up @@ -52,8 +52,8 @@
<ClInclude Include="..\..\ext\rcheevos\src\rc_version.h">
<Filter>rcheevos</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\rcheevos\src\rc_util.h">
<Filter>rcheevos</Filter>
<ClInclude Include="..\..\ext\rcheevos\include\rc_util.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\rcheevos\src\rhash\md5.h">
<Filter>rhash</Filter>
Expand Down
4 changes: 0 additions & 4 deletions android/jni/Android.mk
View file
Expand Up @@ -38,10 +38,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/Locals.mk

LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../ext/cpu_features/include \
$(LOCAL_PATH)/../../ext/rcheevos/include

LOCAL_CFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DHAVE_DLFCN_H -DRC_DISABLE_LUA -D_7ZIP_ST

# http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
Expand Down
2 changes: 2 additions & 0 deletions android/jni/Locals.mk
View file
Expand Up @@ -22,6 +22,8 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../ext/armips/ext/tinyformat \
$(LOCAL_PATH)/../../ext/libchdr/deps/lzma-22.01/include \
$(LOCAL_PATH)/../../ext/libchdr/include \
$(LOCAL_PATH)/../../ext/cpu_features/include \
$(LOCAL_PATH)/../../ext/rcheevos/include \
$(LOCAL_PATH)

LOCAL_STATIC_LIBRARIES := libzip glslang-build miniupnp-build
Expand Down
2 changes: 1 addition & 1 deletion ext/rcheevos
Submodule rcheevos updated 23 files
+0 −8 include/rc_client.h
+0 −35 include/rc_client_raintegration.h
+4 −4 src/rapi/rc_api_common.c
+71 −508 src/rc_client.c
+0 −135 src/rc_client_external.h
+1 −48 src/rc_client_internal.h
+0 −373 src/rc_client_raintegration.c
+0 −44 src/rc_client_raintegration_internal.h
+0 −6 src/rc_libretro.c
+1 −1 src/rc_util.c
+49 −7 src/rcheevos/alloc.c
+8 −2 src/rcheevos/rc_internal.h
+25 −5 src/rcheevos/richpresence.c
+1 −1 src/rcheevos/runtime.c
+4 −5 src/rhash/hash.c
+0 −4 test/Makefile
+0 −9 test/rcheevos-test.vcxproj
+0 −15 test/rcheevos-test.vcxproj.filters
+0 −17 test/test.c
+19 −223 test/test_rc_client.c
+0 −1,224 test/test_rc_client_external.c
+0 −271 test/test_rc_client_raintegration.c
+0 −3 test/test_rc_libretro.c
1 change: 0 additions & 1 deletion ext/rcheevos-build/CMakeLists.txt
View file
Expand Up @@ -22,7 +22,6 @@ set(ALL_SOURCE_FILES
${SRC_DIR}/rcheevos/memref.c
${SRC_DIR}/rcheevos/operand.c
${SRC_DIR}/rc_compat.h
${SRC_DIR}/rc_compat.h
${SRC_DIR}/rc_compat.c
${SRC_DIR}/rc_util.c
${SRC_DIR}/rc_client.c
Expand Down
2 changes: 1 addition & 1 deletion ext/rcheevos-build/rcheevos.vcxproj
View file
Expand Up @@ -75,12 +75,12 @@
<ClInclude Include="..\rcheevos\include\rc_runtime.h" />
<ClInclude Include="..\rcheevos\include\rc_runtime_types.h" />
<ClInclude Include="..\rcheevos\include\rc_url.h" />
<ClInclude Include="..\rcheevos\include\rc_util.h" />
<ClInclude Include="..\rcheevos\src\rapi\rc_api_common.h" />
<ClInclude Include="..\rcheevos\src\rcheevos\rc_internal.h" />
<ClInclude Include="..\rcheevos\src\rcheevos\rc_validate.h" />
<ClInclude Include="..\rcheevos\src\rc_client_internal.h" />
<ClInclude Include="..\rcheevos\src\rc_compat.h" />
<ClInclude Include="..\rcheevos\src\rc_util.h" />
<ClInclude Include="..\rcheevos\src\rc_version.h" />
<ClInclude Include="..\rcheevos\src\rhash\md5.h" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ext/rcheevos-build/rcheevos.vcxproj.filters
View file
Expand Up @@ -152,8 +152,8 @@
<ClInclude Include="..\rcheevos\src\rc_compat.h">
<Filter>rcheevos</Filter>
</ClInclude>
<ClInclude Include="..\rcheevos\src\rc_util.h">
<Filter>rcheevos</Filter>
<ClInclude Include="..\rcheevos\include\rc_util.h">
<Filter>include</Filter>
</ClInclude>
</ItemGroup>
</Project>

0 comments on commit 80547c5

Please sign in to comment.