From 34d35dcf8b76dd8d1bdf85c18ec723ecbe836f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Fri, 12 Jan 2024 14:09:21 +0100
Subject: [PATCH] More buildfix

---
 Common/Data/Encoding/Utf8.cpp     | 2 ++
 Common/Data/Encoding/Utf8.h       | 2 +-
 ext/rcheevos                      | 2 +-
 ext/rcheevos-build/CMakeLists.txt | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Common/Data/Encoding/Utf8.cpp b/Common/Data/Encoding/Utf8.cpp
index 74d9ece0cc..155ddc607e 100644
--- a/Common/Data/Encoding/Utf8.cpp
+++ b/Common/Data/Encoding/Utf8.cpp
@@ -372,6 +372,8 @@ int u8_is_locale_utf8(const char *locale)
   return 0;
 }
 
+UTF8::UTF8(const char *c) : c_(c), size_((int)strlen(c)), index_(0) {}
+
 bool AnyEmojiInString(std::string_view str, size_t byteCount) {
 	int i = 0;
 	while (i < byteCount) {
diff --git a/Common/Data/Encoding/Utf8.h b/Common/Data/Encoding/Utf8.h
index 61b50cab6d..87ede82241 100644
--- a/Common/Data/Encoding/Utf8.h
+++ b/Common/Data/Encoding/Utf8.h
@@ -39,7 +39,7 @@ class UTF8 {
 public:
 	static const uint32_t INVALID = (uint32_t)-1;
 	// TODO: Try to get rid of this constructor.
-	explicit UTF8(const char *c) : c_(c), size_((int)strlen(c)), index_(0) {}
+	explicit UTF8(const char *c);
 	explicit UTF8(std::string_view view) : c_(view.data()), size_((int)view.size()), index_(0) {}
 	explicit UTF8(std::string_view view, int index) : c_(view.data()), size_((int)view.size()), index_(index) {}
 	bool end() const { return index_ == size_; }
diff --git a/ext/rcheevos b/ext/rcheevos
index 64fcb9ea3c..68c70da18f 160000
--- a/ext/rcheevos
+++ b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit 64fcb9ea3cf990e65343057ace9271ff3b77428e
+Subproject commit 68c70da18f7ff814e9e424fd04ad5f294e307018
diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
index cf29f3a595..f60627a5b8 100644
--- a/ext/rcheevos-build/CMakeLists.txt
+++ b/ext/rcheevos-build/CMakeLists.txt
@@ -24,7 +24,6 @@ set(ALL_SOURCE_FILES
 	${SRC_DIR}/rc_compat.h
 	${SRC_DIR}/rc_compat.h
 	${SRC_DIR}/rc_compat.c
-	${SRC_DIR}/rc_util.h
 	${SRC_DIR}/rc_util.c
 	${SRC_DIR}/rc_client.c
 	${SRC_DIR}/rc_client_internal.h