From 36b4fa0dd2b6057d7eee89e494b3a2ee23fc0ff3 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Mon, 2 Nov 2020 23:36:49 +0100 Subject: [PATCH] rpcs3: update to 0.0.13 also update rpcs3-llvm to commit 8c02f52a12550c2044fef262c9864ca2e3cc193e and sync build conf with upstream --- net.rpcs3.RPCS3.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index cec8f8a..83b02a5 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -49,7 +49,7 @@ modules: buildsystem: "cmake-ninja" builddir: true build-options: - cxxflags: "-msse -msse2" + cxxflags: "-msse -msse2 -mcx16" ldflags: "-fuse-ld=lld" env: AR: "llvm-ar" @@ -70,12 +70,13 @@ modules: - "-DLLVM_INCLUDE_UTILS=OFF" - "-DLLVM_USE_INTEL_JITEVENTS=ON" - "-DLLVM_ENABLE_Z3_SOLVER=OFF" + - "-DCMAKE_CXX_STANDARD=17" cleanup: - "*" sources: - type: "git" url: "https://github.com/RPCS3/llvm-mirror.git" - commit: "bb9faf3c8b4e0de05d07cbe623a1bf45874b5174" + commit: "8c02f52a12550c2044fef262c9864ca2e3cc193e" - name: "rpcs3" buildsystem: "cmake-ninja" @@ -109,4 +110,5 @@ modules: sources: - type: "git" url: "https://github.com/RPCS3/rpcs3.git" - commit: "06ecc2ae68ebdd27455b4ebbdc789478a574de0b" + tag: "v0.0.13" + commit: "09a9d08466583df18925c59c8fec74f956ff0b1a"