summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/android/app/build.gradle.kts11
-rw-r--r--src/core/hle/service/cmif_types.h2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index d44bb4c74..cb026211c 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): String {
259} 259}
260 260
261fun getGitVersion(): String { 261fun getGitVersion(): String {
262 val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long")) 262 val gitVersion = runGitCommand(
263 listOf(
264 "git",
265 "describe",
266 "--always",
267 "--long"
268 )
269 ).replace(Regex("(-0)?-[^-]+$"), "")
263 val versionName = if (System.getenv("GITHUB_ACTIONS") != null) { 270 val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
264 System.getenv("GIT_TAG_NAME") ?: gitVersion 271 System.getenv("GIT_TAG_NAME") ?: gitVersion
265 } else { 272 } else {
266 gitVersion 273 gitVersion
267 } 274 }
268 return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" } 275 return versionName.ifEmpty { "0.0" }
269} 276}
270 277
271fun getGitHash(): String = 278fun getGitHash(): String =
diff --git a/src/core/hle/service/cmif_types.h b/src/core/hle/service/cmif_types.h
index 84f4c2456..325304d5c 100644
--- a/src/core/hle/service/cmif_types.h
+++ b/src/core/hle/service/cmif_types.h
@@ -262,7 +262,7 @@ class OutLargeData {
262public: 262public:
263 static_assert(std::is_trivially_copyable_v<T>, "LargeData type must be trivially copyable"); 263 static_assert(std::is_trivially_copyable_v<T>, "LargeData type must be trivially copyable");
264 static_assert((A & BufferAttr_In) == 0, "OutLargeData attr must not be In"); 264 static_assert((A & BufferAttr_In) == 0, "OutLargeData attr must not be In");
265 static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize); 265 static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_Out | BufferAttr_FixedSize);
266 using Type = T; 266 using Type = T;
267 267
268 /* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {} 268 /* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {}