fix
This commit is contained in:
parent
eeba641732
commit
804eb7aa5a
@ -3,6 +3,8 @@
|
||||
BUILD_TYPE=$1
|
||||
BUILD_CLEAN=$2
|
||||
IS_MINGW=$3
|
||||
IS_WIN32=$4
|
||||
|
||||
if [ "${IS_MINGW}" == "1" ]; then
|
||||
BUILD_ROOT=build3
|
||||
else
|
||||
@ -32,10 +34,13 @@ pushd ../${BUILD_ROOT}/${BUILD_FOLDER}
|
||||
|
||||
if [ "${IS_MINGW}" == "1" ]; then
|
||||
TOOLCHAIN=$(realpath ../../cmake/mingw-w64-x86_64.cmake)
|
||||
EXE_EXT=.exe
|
||||
CMAKE_ADDITIONAL_OPTS=-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
|
||||
fi
|
||||
|
||||
if [ "${IS_MINGW}" == "1" ] || [ "${IS_WIN32}" == "1" ]; then
|
||||
EXE_EXT=.exe
|
||||
fi
|
||||
|
||||
cmake ../.. ${CMAKE_ADDITIONAL_OPTS} \
|
||||
-G"Unix Makefiles" \
|
||||
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
|
||||
|
@ -1,5 +1,5 @@
|
||||
@echo off
|
||||
|
||||
pushd "%~dp0%.."
|
||||
mingw64 scripts/make_common.sh %1 "%2"
|
||||
mingw64 scripts/make_common.sh %1 "%2" 0 1
|
||||
popd
|
||||
|
Loading…
x
Reference in New Issue
Block a user