mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Kill BUILD_CONFIG

Browse Source 
It was basically just CONFIGURATION but less confusing. CONFIGURATION
could just be less confusing.
This commit is contained in:
AnyOldName3 2020-09-04 00:45:41 +01:00
parent dc34380f62
commit f4db29a717
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CI/before_script.msvc.sh
View File

@ -380,17 +380,14 @@ esac
case $CONFIGURATION in case $CONFIGURATION in
debug|Debug|DEBUG ) debug|Debug|DEBUG )
CONFIGURATION=Debug CONFIGURATION=Debug
BUILD_CONFIG=Debug
;; ;;
release|Release|RELEASE ) release|Release|RELEASE )
CONFIGURATION=Release CONFIGURATION=Release
BUILD_CONFIG=Release
;; ;;
relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO ) relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
CONFIGURATION=Release CONFIGURATION=RelWithDebInfo
BUILD_CONFIG=RelWithDebInfo
;; ;;
esac esac
@ -422,7 +419,7 @@ else
fi fi
if [ -n "$SINGLE_CONFIG" ]; then if [ -n "$SINGLE_CONFIG" ]; then
add_cmake_opts "-DCMAKE_BUILD_TYPE=${BUILD_CONFIG}" add_cmake_opts "-DCMAKE_BUILD_TYPE=${CONFIGURATION}"
fi fi
if ! [ -z $UNITY_BUILD ]; then if ! [ -z $UNITY_BUILD ]; then
@ -525,7 +522,7 @@ elif [ -n "$NINJA" ]; then
fi fi
if [ -n "$SINGLE_CONFIG" ]; then if [ -n "$SINGLE_CONFIG" ]; then
BUILD_DIR="${BUILD_DIR}_${BUILD_CONFIG}" BUILD_DIR="${BUILD_DIR}_${CONFIGURATION}"
fi fi
if [ -z $KEEP ]; then if [ -z $KEEP ]; then
@ -907,8 +904,8 @@ fi
echo "- Copying Runtime DLLs..." echo "- Copying Runtime DLLs..."
DLL_PREFIX="" DLL_PREFIX=""
if [ -z $SINGLE_CONFIG ]; then if [ -z $SINGLE_CONFIG ]; then
mkdir -p $BUILD_CONFIG mkdir -p $CONFIGURATION
DLL_PREFIX="$BUILD_CONFIG/" DLL_PREFIX="$CONFIGURATION/"
fi fi
for DLL in $RUNTIME_DLLS; do for DLL in $RUNTIME_DLLS; do
TARGET="$(basename "$DLL")" TARGET="$(basename "$DLL")"