mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Update external modules (#1755)
* Update flatbuffers to 24.3.25 * Update protobuf to 27.1 * Update mbedtls to 3.6.0 * Change source of Vulkan SDK * Readd directx-sdk * Windows Fix? * Update qt5_6.yml * Typo * Revert "Update qt5_6.yml" This reverts commit cf8db993ec9b9d18b9054f992c77fe687ba8c412. --------- Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
This commit is contained in:
parent
1fd40571af
commit
943f9e22f3
15
.github/workflows/qt5_6.yml
vendored
15
.github/workflows/qt5_6.yml
vendored
@ -163,19 +163,26 @@ jobs:
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
|
||||
key: ${{ runner.os }}${{ inputs.qt_version == '6' && '-chocolatey-qt6' || '-chocolatey' }}
|
||||
key: ${{ runner.os }}${{ '-chocolatey' }}
|
||||
|
||||
- name: 📥 Install DirectX SDK, OpenSSL, libjpeg-turbo ${{ inputs.qt_version == '6' && 'and Vulkan-SDK' || '' }}
|
||||
- name: 📥 Install DirectX SDK, OpenSSL, libjpeg-turbo
|
||||
shell: powershell
|
||||
run: |
|
||||
choco install --no-progress directx-sdk ${{env.VULKAN_SDK}} -y
|
||||
choco install --no-progress directx-sdk -y
|
||||
choco install --no-progress ${{env.OPENSSL}} -y
|
||||
Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/3.0.1/libjpeg-turbo-3.0.1-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
|
||||
.\libjpeg-turbo /S
|
||||
env:
|
||||
VULKAN_SDK: ${{ inputs.qt_version == '6' && 'vulkan-sdk' || '' }}
|
||||
OPENSSL: ${{ inputs.qt_version == '6' && 'openssl' || 'openssl --version=1.1.1.2100' }}
|
||||
|
||||
- name: Install Vulkan SDK
|
||||
if: ${{ inputs.qt_version == '6' }}
|
||||
uses: jakoch/install-vulkan-sdk-action@v1.0.3
|
||||
with:
|
||||
install_runtime: false
|
||||
cache: true
|
||||
stripdown: true
|
||||
|
||||
- name: 📥 Install Qt
|
||||
uses: jurplel/install-qt-action@v4
|
||||
with:
|
||||
|
2
dependencies/external/flatbuffers
vendored
2
dependencies/external/flatbuffers
vendored
@ -1 +1 @@
|
||||
Subproject commit 0100f6a5779831fa7a651e4b67ef389a8752bd9b
|
||||
Subproject commit 595bf0007ab1929570c7671f091313c8fc20644e
|
2
dependencies/external/mbedtls
vendored
2
dependencies/external/mbedtls
vendored
@ -1 +1 @@
|
||||
Subproject commit edb8fec9882084344a314368ac7fd957a187519c
|
||||
Subproject commit 2ca6c285a0dd3f33982dd57299012dacab1ff206
|
2
dependencies/external/protobuf
vendored
2
dependencies/external/protobuf
vendored
@ -1 +1 @@
|
||||
Subproject commit 7f94235e552599141950d7a4a3eaf93bc87d1b22
|
||||
Subproject commit 3d9f7c430a5ae1385512908801492d4421c3cdb7
|
@ -1,3 +1,5 @@
|
||||
add_compile_definitions("_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
|
||||
|
||||
# set and compile proto schema
|
||||
set(ProtoServer_PROTOS ${CMAKE_SOURCE_DIR}/libsrc/protoserver/message.proto)
|
||||
protobuf_generate_cpp(ProtoServer_PROTO_SRCS ProtoServer_PROTO_HDRS ${ProtoServer_PROTOS})
|
||||
|
Loading…
x
Reference in New Issue
Block a user