The-Homebrew-Cloud/Lime3DS
2
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-11-10 20:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from rtiangha/updates

Browse Source 
Dependency Updates
This commit is contained in:
OpenSauce 2024-04-11 23:33:21 +01:00 committed by GitHub
commit 337ce6ec2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored
View File

@ -80,6 +80,10 @@ jobs:
key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.target }}- ${{ runner.os }}-${{ matrix.target }}-
- name: Setup XCode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
- name: Install tools - name: Install tools
run: brew install ccache ninja spirv-tools run: brew install ccache ninja spirv-tools
- name: Build - name: Build
@ -153,11 +157,13 @@ jobs:
- name: Install extra tools (MSVC) - name: Install extra tools (MSVC)
run: choco install ccache ninja wget run: choco install ccache ninja wget
if: ${{ matrix.target == 'msvc' }} if: ${{ matrix.target == 'msvc' }}
- name: Install vulkan-sdk (MSVC) - name: Set up Vulkan SDK (MSVC)
run: | uses: humbletim/setup-vulkan-sdk@v1.2.0
wget https://sdk.lunarg.com/sdk/download/1.3.280.0/windows/VulkanSDK-1.3.280.0-Installer.exe -O D:/a/_temp/vulkan.exe
D:/a/_temp/vulkan.exe --accept-licenses --default-answer --confirm-command install
if: ${{ matrix.target == 'msvc' }} if: ${{ matrix.target == 'msvc' }}
with:
vulkan-query-version: latest
vulkan-components: SPIRV-Tools
vulkan-use-cache: true
- name: Set up MSYS2 - name: Set up MSYS2
uses: msys2/setup-msys2@v2 uses: msys2/setup-msys2@v2
if: ${{ matrix.target == 'msys2' }} if: ${{ matrix.target == 'msys2' }}
@ -248,6 +254,10 @@ jobs:
key: ${{ runner.os }}-ios-${{ github.sha }} key: ${{ runner.os }}-ios-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-ios- ${{ runner.os }}-ios-
- name: Setup XCode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
- name: Install tools - name: Install tools
run: brew install ccache ninja run: brew install ccache ninja
- name: Build - name: Build

2
CMakeLists.txt
View File

@ -235,7 +235,7 @@ find_package(Threads REQUIRED)
if (ENABLE_QT) if (ENABLE_QT)
if (NOT USE_SYSTEM_QT) if (NOT USE_SYSTEM_QT)
download_qt(6.6.0) download_qt(6.7.0)
endif() endif()
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent) find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)

2
externals/catch2 vendored

@ -1 +1 @@
Subproject commit 8ac8190e494a381072c89f5e161b92a08d98b37b Subproject commit b5373dadca40b7edc8570cf9470b9b1cb1934d40

2
externals/cubeb vendored

@ -1 +1 @@
Subproject commit 1572ea3e8d50514d3adaba1ad17272f57b5b331c Subproject commit 67db4cbc18581c8a6d8ea935af9854ed9729e7a7

2
externals/libyuv vendored

@ -1 +1 @@
Subproject commit ba796a32e774270386075fa6f354598d757c1a3b Subproject commit 3af6cafe8d3753536a1f0e9e831fb9fd4563e10b

2
externals/openal-soft vendored

@ -1 +1 @@
Subproject commit ee54760865d345fda8ce467976c54af73ddff5c9 Subproject commit 111397c71a5f1c2c88e05da9c84edfdba2e472a4

2
externals/sdl2/SDL vendored

@ -1 +1 @@
Subproject commit 4d91f0e796b146c3bcf2cda22251b1e56cc0ebfb Subproject commit e75d72670f66cd1943018eec9c6bfbef1c6d81c4