blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 06:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating scripts and build files to reference Qt 6.5, and update OpenSSL to 3.1.0

Browse source
This commit is contained in:
Dan Paulat 2023-04-21 13:44:46 -05:00
parent 92f2c76a70
commit f4a50f4e1e
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -28,7 +28,7 @@ jobs:
msvc_arch: x64 msvc_arch: x64
msvc_toolset: 14.34 msvc_toolset: 14.34
msvc_version: 2022 msvc_version: 2022
qt_version: 6.4.2 qt_version: 6.5.0
qt_arch: win64_msvc2019_64 qt_arch: win64_msvc2019_64
qt_tools: '' qt_tools: ''
conan_arch: x86_64 conan_arch: x86_64
@ -43,7 +43,7 @@ jobs:
env_cc: gcc-11 env_cc: gcc-11
env_cxx: g++-11 env_cxx: g++-11
compiler: gcc compiler: gcc
qt_version: 6.4.2 qt_version: 6.5.0
qt_arch: gcc_64 qt_arch: gcc_64
qt_tools: '' qt_tools: ''
conan_arch: x86_64 conan_arch: x86_64

2
conanfile.txt
View file

@ -8,7 +8,7 @@ glm/cci.20220420
gtest/cci.20210126 gtest/cci.20210126
libcurl/7.86.0 libcurl/7.86.0
libxml2/2.10.3 libxml2/2.10.3
openssl/1.1.1t openssl/3.1.0
spdlog/1.11.0 spdlog/1.11.0
sqlite3/3.40.1 sqlite3/3.40.1
vulkan-loader/1.3.236.0 vulkan-loader/1.3.236.0

2
setup-debug.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-debug mkdir build-debug
cd build-debug cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
pause pause

2
setup-debug.sh
View file

@ -2,4 +2,4 @@
./tools/setup-common.sh ./tools/setup-common.sh
mkdir -p build-debug mkdir -p build-debug
cd build-debug cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 .. cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..

2
setup-release.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-release mkdir build-release
cd build-release cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 ..
pause pause

2
setup-release.sh
View file

@ -2,4 +2,4 @@
./tools/setup-common.sh ./tools/setup-common.sh
mkdir -p build-release mkdir -p build-release
cd build-release cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 ..