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 cf8db993ec.

---------

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
This commit is contained in:
LordGrey
2024-06-14 20:39:27 +02:00
committed by GitHub
parent 1fd40571af
commit 943f9e22f3
5 changed files with 16 additions and 7 deletions

View File

@@ -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:

View File

@@ -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})