diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index fa516a56be..fa6922657d 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -24,8 +24,6 @@ #include "ext/rcheevos/include/rc_api_info.h" #include "ext/rcheevos/include/rc_api_request.h" #include "ext/rcheevos/include/rc_api_runtime.h" -#include "ext/rcheevos/include/rc_api_user.h" -#include "ext/rcheevos/include/rc_url.h" #include "ext/rapidjson/include/rapidjson/document.h" diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj index b448fbd889..fc2143680c 100644 --- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj +++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj @@ -64,6 +64,7 @@ + diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters index 28d7abc2fe..a82e68cbf3 100644 --- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters +++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters @@ -149,5 +149,8 @@ rcheevos + + rhash + \ No newline at end of file diff --git a/android/jni/Android.mk b/android/jni/Android.mk index aa551d1152..086f4c194d 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -183,7 +183,8 @@ RCHEEVOS_FILES := \ ${SRC}/ext/rcheevos/src/rcheevos/runtime_progress.c \ ${SRC}/ext/rcheevos/src/rcheevos/trigger.c \ ${SRC}/ext/rcheevos/src/rcheevos/value.c \ - ${SRC}/ext/rcheevos/src/rhash/md5.c + ${SRC}/ext/rcheevos/src/rhash/md5.c \ + ${SRC}/ext/rcheevos/src/rhash/hash.c ifeq ($(TARGET_ARCH_ABI),arm64-v8a) ADRENOTOOLS_FILES := \ diff --git a/ext/rcheevos b/ext/rcheevos index ef0e22bc07..b443902b1c 160000 --- a/ext/rcheevos +++ b/ext/rcheevos @@ -1 +1 @@ -Subproject commit ef0e22bc076235315b94499bbd9f799a3c781708 +Subproject commit b443902b1cdfee5a66b09fec20a94d2d2afaf2ec diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt index 8d65767699..9d6320cb06 100644 --- a/ext/rcheevos-build/CMakeLists.txt +++ b/ext/rcheevos-build/CMakeLists.txt @@ -35,9 +35,10 @@ set(ALL_SOURCE_FILES ${SRC_DIR}/rcheevos/runtime_progress.c ${SRC_DIR}/rcheevos/trigger.c ${SRC_DIR}/rcheevos/value.c - # rhash (still need just md5) + # rhash (still need just md5, hash) ${SRC_DIR}/rhash/md5.c ${SRC_DIR}/rhash/md5.h + ${SRC_DIR}/rhash/hash.c ) add_library(rcheevos STATIC ${ALL_SOURCE_FILES}) diff --git a/ext/rcheevos-build/rcheevos.vcxproj b/ext/rcheevos-build/rcheevos.vcxproj index 4c507caf95..6b190fe1cb 100644 --- a/ext/rcheevos-build/rcheevos.vcxproj +++ b/ext/rcheevos-build/rcheevos.vcxproj @@ -54,6 +54,7 @@ + @@ -69,7 +70,6 @@ - diff --git a/ext/rcheevos-build/rcheevos.vcxproj.filters b/ext/rcheevos-build/rcheevos.vcxproj.filters index d586f6b240..8a290336bf 100644 --- a/ext/rcheevos-build/rcheevos.vcxproj.filters +++ b/ext/rcheevos-build/rcheevos.vcxproj.filters @@ -90,6 +90,9 @@ rcheevos + + rcheevos + @@ -125,9 +128,6 @@ include - - include - include diff --git a/libretro/Makefile.common b/libretro/Makefile.common index aa1de6dc51..a2de028bd2 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -263,7 +263,8 @@ SOURCES_C += \ $(EXTDIR)/rcheevos/src/rcheevos/runtime_progress.c \ $(EXTDIR)/rcheevos/src/rcheevos/trigger.c \ $(EXTDIR)/rcheevos/src/rcheevos/value.c \ - $(EXTDIR)/rcheevos/src/rhash/md5.c + $(EXTDIR)/rcheevos/src/rhash/md5.c \ + $(EXTDIR)/rcheevos/src/rhash/hash.c COREFLAGS += -DSTACK_LINE_READER_BUFFER_SIZE=1024 COREFLAGS += -DHTTPS_NOT_AVAILABLE