mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-06 11:41:33 +00:00
Merge branch 'stfu_git' into 'master'
Silence a minor git warning See merge request OpenMW/openmw!2028
This commit is contained in:
commit
69861ce80b
3 changed files with 9 additions and 0 deletions
|
@ -3,6 +3,9 @@
|
||||||
# hack to work around: FFmpeg version is too old, 3.2 is required
|
# hack to work around: FFmpeg version is too old, 3.2 is required
|
||||||
sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
|
sed -i s/"NOT FFVER_OK"/"FALSE"/ CMakeLists.txt
|
||||||
|
|
||||||
|
# Silence a git warning
|
||||||
|
git config --global advice.detachedHead false
|
||||||
|
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,9 @@ set -xeo pipefail
|
||||||
|
|
||||||
free -m
|
free -m
|
||||||
|
|
||||||
|
# Silence a git warning
|
||||||
|
git config --global advice.detachedHead false
|
||||||
|
|
||||||
BUILD_UNITTESTS=OFF
|
BUILD_UNITTESTS=OFF
|
||||||
BUILD_BENCHMARKS=OFF
|
BUILD_BENCHMARKS=OFF
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,9 @@
|
||||||
export CXX=clang++
|
export CXX=clang++
|
||||||
export CC=clang
|
export CC=clang
|
||||||
|
|
||||||
|
# Silence a git warning
|
||||||
|
git config --global advice.detachedHead false
|
||||||
|
|
||||||
DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
|
DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
|
||||||
QT_PATH=$(brew --prefix qt@5)
|
QT_PATH=$(brew --prefix qt@5)
|
||||||
CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
|
CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
|
||||||
|
|
Loading…
Reference in a new issue