mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 18:15:35 +00:00
Code Issues Releases Wiki Activity

Fix if statements

Browse source
This commit is contained in:
AnyOldName3 2018-12-07 15:03:36 +00:00
parent 14fcb9158f
commit 2a2d9f0006
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CI/before_script.msvc.sh
View file

@ -114,7 +114,7 @@ EOF
done done
done done
if [ -n $NMAKE ]; then if [ -n "$NMAKE" ]; then
command -v nmake -? >/dev/null 2>&1 || { echo "Error: nmake (NMake) is not on the path. Make sure you have the necessary environment variables set for command-line C++ development (for example, by starting from a Developer Command Prompt)."; exit 1; } command -v nmake -? >/dev/null 2>&1 || { echo "Error: nmake (NMake) is not on the path. Make sure you have the necessary environment variables set for command-line C++ development (for example, by starting from a Developer Command Prompt)."; exit 1; }
fi fi
@ -312,13 +312,13 @@ if [ ${BITS} -eq 64 ]; then
GENERATOR="${GENERATOR} Win64" GENERATOR="${GENERATOR} Win64"
fi fi
if [ -n $NMAKE ]; then if [ -n "$NMAKE" ]; then
GENERATOR="NMake Makefiles" GENERATOR="NMake Makefiles"
fi fi
add_cmake_opts "-G\"$GENERATOR\"" add_cmake_opts "-G\"$GENERATOR\""
if [ -n $NMAKE ]; then if [ -n "$NMAKE" ]; then
add_cmake_opts "-DCMAKE_BUILD_TYPE=${BUILD_CONFIG}" add_cmake_opts "-DCMAKE_BUILD_TYPE=${BUILD_CONFIG}"
fi fi
@ -402,7 +402,7 @@ cd .. #/..
# Set up dependencies # Set up dependencies
BUILD_DIR="MSVC${MSVC_DISPLAY_YEAR}_${BITS}" BUILD_DIR="MSVC${MSVC_DISPLAY_YEAR}_${BITS}"
if [ -n $NMAKE ]; then if [ -n "$NMAKE" ]; then
BUILD_DIR="${BUILD_DIR}_NMake_${BUILD_CONFIG}" BUILD_DIR="${BUILD_DIR}_NMake_${BUILD_CONFIG}"
fi fi