Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update MoltenVK integration on iOS.
Some checks are pending
Build Android / build_android (apk) (push) Waiting to run
Details
Build Android / build_android (libretro) (push) Waiting to run
Details
Build iOS / build_ios (push) Waiting to run
Details
Build Linux ARM64 / build_linux_arm64 (push) Waiting to run
Details
Build macOS / build_macos (push) Waiting to run
Details
Build Windows Psf / build_windows_psf (off, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Waiting to run
Details
Build Windows Psf / build_windows_psf (on, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Waiting to run
Details
Check Format / run_clangformat (push) Waiting to run
Details
Build JavaScript / build_js (push) Waiting to run
Details
Build Linux / build_linux (push) Waiting to run
Details
Build Linux ARM32 / build_linux_arm32 (push) Waiting to run
Details
Build Windows / build_windows (x86_32, Visual Studio 16 2019, installer32.nsi, win32_msvc2019, Win32) (push) Waiting to run
Details
Build Windows / build_windows (x86_64, Visual Studio 16 2019, installer64.nsi, win64_msvc2019_64, x64) (push) Waiting to run
Details

Browse source
This commit is contained in:
Jean-Philip Desjardins 2025-03-30 20:39:32 -04:00
parent a2154deac8
commit 2d1219fb38
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build-ios.yaml vendored
View file

@ -11,12 +11,12 @@ jobs:
- name: Install Vulkan SDK - name: Install Vulkan SDK
run: | run: |
cd $RUNNER_WORKSPACE cd $RUNNER_WORKSPACE
curl -L --show-error --output vulkansdk.dmg https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/mac/vulkansdk-macos-${VULKAN_SDK_VERSION}.dmg?Human=true curl -L --show-error --output vulkansdk.zip https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/mac/vulkansdk-macos-${VULKAN_SDK_VERSION}.zip?Human=true
hdiutil attach vulkansdk.dmg unzip vulkansdk.zip
sudo /Volumes/vulkansdk-macos-${VULKAN_SDK_VERSION}/InstallVulkan.app/Contents/MacOS/InstallVulkan in --al --c sudo ./InstallVulkan-${VULKAN_SDK_VERSION}.app/Contents/MacOS/InstallVulkan-${VULKAN_SDK_VERSION} in --al --c com.lunarg.vulkan.ios
echo "VULKAN_SDK=~/VulkanSDK/${VULKAN_SDK_VERSION}/macOS" >> $GITHUB_ENV echo "VULKAN_SDK=${HOME}/VulkanSDK/${VULKAN_SDK_VERSION}/iOS" >> $GITHUB_ENV
env: env:
VULKAN_SDK_VERSION: '1.3.268.1' VULKAN_SDK_VERSION: '1.4.309.0'
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:

10
Source/ui_ios/CMakeLists.txt
View file

@ -152,7 +152,6 @@ set(OSX_RES
if(USE_GSH_VULKAN) if(USE_GSH_VULKAN)
list(APPEND OSX_SOURCES GSH_VulkaniOS.cpp) list(APPEND OSX_SOURCES GSH_VulkaniOS.cpp)
list(APPEND OSX_HEADERS GSH_VulkaniOS.h) list(APPEND OSX_HEADERS GSH_VulkaniOS.h)
list(APPEND OSX_RES "$ENV{VULKAN_SDK}/../MoltenVK/dylib/iOS/libMoltenVK.dylib")
endif() endif()
# Add our Executable # Add our Executable
@ -187,3 +186,12 @@ set_target_properties(
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
RESOURCE "${OSX_RES}" RESOURCE "${OSX_RES}"
) )
if(USE_GSH_VULKAN)
set_target_properties(
Play
PROPERTIES
XCODE_EMBED_FRAMEWORKS "$ENV{VULKAN_SDK}/lib/MoltenVK.xcframework"
XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY TRUE
)
endif()