mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 12:40:25 +00:00
Code Issues Releases Wiki Activity

before_script.msvc.sh: fix occurences of shellcheck SC2237

Browse source
This commit is contained in:
Austin English 2024-06-02 20:27:07 -05:00
parent 05815b3952
commit c668a96999
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CI/before_script.msvc.sh
View file

@ -544,7 +544,7 @@ if [ -n "$SINGLE_CONFIG" ]; then
add_cmake_opts "-DCMAKE_BUILD_TYPE=${CONFIGURATIONS[0]}" add_cmake_opts "-DCMAKE_BUILD_TYPE=${CONFIGURATIONS[0]}"
fi fi
if ! [ -z $UNITY_BUILD ]; then if [[ -n "$UNITY_BUILD" ]]; then
add_cmake_opts "-DOPENMW_UNITY_BUILD=True" add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
fi fi
@ -559,11 +559,11 @@ fi
# turn on LTO by default # turn on LTO by default
add_cmake_opts "-DOPENMW_LTO_BUILD=True" add_cmake_opts "-DOPENMW_LTO_BUILD=True"
if ! [ -z "$USE_WERROR" ]; then if [[ -n "$USE_WERROR" ]]; then
add_cmake_opts "-DOPENMW_MSVC_WERROR=ON" add_cmake_opts "-DOPENMW_MSVC_WERROR=ON"
fi fi
if ! [ -z "$USE_CLANG_TIDY" ]; then if [[ -n "$USE_CLANG_TIDY" ]]; then
add_cmake_opts "-DCMAKE_CXX_CLANG_TIDY=\"clang-tidy --warnings-as-errors=*\"" add_cmake_opts "-DCMAKE_CXX_CLANG_TIDY=\"clang-tidy --warnings-as-errors=*\""
fi fi
@ -578,7 +578,7 @@ QT_VER="6.6.2"
OSG_ARCHIVE_NAME="OSGoS 3.6.5" OSG_ARCHIVE_NAME="OSGoS 3.6.5"
OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}" OSG_ARCHIVE="OSGoS-3.6.5-123-g68c5c573d-msvc${OSG_MSVC_YEAR}-win${BITS}"
OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main" OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main"
if ! [ -z $OSG_MULTIVIEW_BUILD ]; then if [[ -n "$OSG_MULTIVIEW_BUILD" ]]; then
OSG_ARCHIVE_NAME="OSG-3.6-multiview" OSG_ARCHIVE_NAME="OSG-3.6-multiview"
OSG_ARCHIVE="OSG-3.6-multiview-d2ee5aa8-msvc${OSG_MSVC_YEAR}-win${BITS}" OSG_ARCHIVE="OSG-3.6-multiview-d2ee5aa8-msvc${OSG_MSVC_YEAR}-win${BITS}"
OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview" OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview"
@ -866,7 +866,7 @@ printf "${OSG_ARCHIVE_NAME}... "
SUFFIX_UPCASE="" SUFFIX_UPCASE=""
fi fi
if ! [ -z $OSG_MULTIVIEW_BUILD ]; then if [[ -n "$OSG_MULTIVIEW_BUILD" ]]; then
add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,libpng16}${SUFFIX}.dll \ add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,libpng16}${SUFFIX}.dll \
"$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll
else else