Merge branch 'Vita3K:master' into master

backgamon · Apr 27, 2024 · f734baf · f734baf
2 parents 86be304 + 418f234
commit f734baf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -44,7 +44,7 @@ jobs:
           - os: macos-latest
             version: zip
             cache_path: ~/Library/Caches/ccache
-            extra_cmake_args: 
+            extra_cmake_args: -DCMAKE_OSX_ARCHITECTURES="x86_64"
             cmake_preset: macos-ninja
         exclude:
           - os: macos-latest
@@ -61,11 +61,11 @@ jobs:
       - name: Set up build environment (macos-latest)
         run: |
           brew install ccache ninja create-dmg
-          brew fetch --force --bottle-tag=monterey boost openssl@3 molten-vk
-          brew install $(brew --cache --bottle-tag=monterey boost)
-          brew install $(brew --cache --bottle-tag=monterey molten-vk)
-          brew reinstall $(brew --cache --bottle-tag=monterey openssl@3)
-          echo "/usr/local/opt/ccache/libexec" >> $GITHUB_PATH
+          brew fetch --force --bottle-tag=x86_64_monterey boost openssl@3 molten-vk
+          brew install $(brew --cache --bottle-tag=x86_64_monterey boost)
+          brew install $(brew --cache --bottle-tag=x86_64_monterey molten-vk)
+          brew reinstall $(brew --cache --bottle-tag=x86_64_monterey openssl@3)
+          echo "$(brew --prefix ccache)/libexec" >> $GITHUB_PATH
           ccache --set-config=compiler_check=content
         if: matrix.os == 'macos-latest'
 

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -331,7 +331,9 @@ target_include_directories(libatrac9 PUBLIC LibAtrac9/C/src)
 option(BUILD_SHARED_LIBS "Build shared library" OFF)
 option(XXHASH_BUILD_XXHSUM "Build the xxhsum binary" OFF)
 option(XXH_X86DISPATCH_ALLOW_AVX "Allow building XXH3 with AVX even if it crashes on SSE2-Only CPUs" OFF)
-set(DISPATCH 1)
+if(NOT APPLE)
+	set(DISPATCH 1)
+endif()
 add_subdirectory(xxHash/cmake_unofficial EXCLUDE_FROM_ALL)
 if(XXH_X86DISPATCH_ALLOW_AVX)
 	target_compile_definitions(xxhash PRIVATE XXH_X86DISPATCH_ALLOW_AVX)

diff --git a/vita3k/CMakeLists.txt b/vita3k/CMakeLists.txt
@@ -183,7 +183,7 @@ if(APPLE)
 		POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/external/discord_game_sdk/lib/x86_64/discord_game_sdk.dylib" "$<TARGET_FILE_DIR:vita3k>/../Resources")
 	endif()
-	set_target_properties(vita3k PROPERTIES LINK_FLAGS "-rpath @loader_path/../Frameworks/ -rpath @loader_path/../Resources/")
+	set_target_properties(vita3k PROPERTIES LINK_FLAGS "-rpath @loader_path/../Frameworks/ -rpath @loader_path/../Resources/ -ld64")
 	target_sources(vita3k PRIVATE Vita3K.icns)
 	set(MACOSX_BUNDLE_ICON_FILE Vita3K.icns)
 	set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.Vita3K.Vita3K")

diff --git a/vita3k/modules/SceGxm/SceGxm.cpp b/vita3k/modules/SceGxm/SceGxm.cpp
@@ -21,7 +21,7 @@
 
 #include <span>
 #include <stack>
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(__APPLE__)
 #include <xxh_x86dispatch.h>
 #else
 #define XXH_INLINE_ALL

diff --git a/vita3k/renderer/src/texture/cache.cpp b/vita3k/renderer/src/texture/cache.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <cstring>
 #include <numeric>
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(__APPLE__)
 #include <xxh_x86dispatch.h>
 #else
 #define XXH_INLINE_ALL