BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

fix

Browse Source
This commit is contained in:
Scott E. Graves 2023-12-12 13:11:46 -06:00
parent eeba641732
commit 804eb7aa5a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/make_common.sh
View File

@ -3,6 +3,8 @@
BUILD_TYPE=$1 BUILD_TYPE=$1
BUILD_CLEAN=$2 BUILD_CLEAN=$2
IS_MINGW=$3 IS_MINGW=$3
IS_WIN32=$4
if [ "${IS_MINGW}" == "1" ]; then if [ "${IS_MINGW}" == "1" ]; then
BUILD_ROOT=build3 BUILD_ROOT=build3
else else
@ -32,10 +34,13 @@ pushd ../${BUILD_ROOT}/${BUILD_FOLDER}
if [ "${IS_MINGW}" == "1" ]; then if [ "${IS_MINGW}" == "1" ]; then
TOOLCHAIN=$(realpath ../../cmake/mingw-w64-x86_64.cmake) TOOLCHAIN=$(realpath ../../cmake/mingw-w64-x86_64.cmake)
EXE_EXT=.exe
CMAKE_ADDITIONAL_OPTS=-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN} CMAKE_ADDITIONAL_OPTS=-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
fi fi
if [ "${IS_MINGW}" == "1" ] || [ "${IS_WIN32}" == "1" ]; then
EXE_EXT=.exe
fi
cmake ../.. ${CMAKE_ADDITIONAL_OPTS} \ cmake ../.. ${CMAKE_ADDITIONAL_OPTS} \
-G"Unix Makefiles" \ -G"Unix Makefiles" \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \

2
scripts/make_win32.cmd
View File

@ -1,5 +1,5 @@
@echo off @echo off
pushd "%~dp0%.." pushd "%~dp0%.."
mingw64 scripts/make_common.sh %1 "%2" mingw64 scripts/make_common.sh %1 "%2" 0 1
popd popd