3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix fresh build

Browse source
This commit is contained in:
3d-gussner 2021-07-17 19:06:58 +02:00
parent 9fd9ce34a9
commit ffb7412637
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
MK404-build.sh
View file

@ -305,9 +305,16 @@ if [ "$update_flag" == "1" ]; then
fi fi
# Prepare MK404 # Prepare MK404
mkdir -p $MK404_BUILD_PATH if [ ! -d $MK404_BUILD_PATH ]; then
mkdir -p $MK404_BUILD_PATH
fi
if [[ ! -f "$MK404_BUILD_PATH/Makefile" || "$new_build_flag" == "1" ]]; then if [[ ! -f "$MK404_BUILD_PATH/Makefile" || "$new_build_flag" == "1" ]]; then
# Init and update submodules # Init and update submodules
if [ -d $MK404_BUILD_PATH ]; then
rm -rf $MK404_BUILD_PATH
mkdir -p $MK404_BUILD_PATH
fi
git submodule init git submodule init
git submodule update git submodule update
cmake -B$MK404_BUILD_PATH -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" cmake -B$MK404_BUILD_PATH -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles"

8
PF-build.sh
View file

@ -1449,6 +1449,8 @@ if [[ "$output_flag" == "1" || -z "$output_flag" ]]; then
mk404_flag=1 mk404_flag=1
elif [ "$mk404_choose1" == "2" ]; then elif [ "$mk404_choose1" == "2" ]; then
mk404_flag=2 mk404_flag=2
else
mk404_flag=1 #default
fi fi
echo echo
echo "Choose MK404 graphics" echo "Choose MK404 graphics"
@ -1457,7 +1459,7 @@ if [[ "$output_flag" == "1" || -z "$output_flag" ]]; then
echo "2 = fancy" echo "2 = fancy"
echo "3 = lite with Quad_HR" echo "3 = lite with Quad_HR"
echo "4 = fancy lite with Quad_HR" echo "4 = fancy lite with Quad_HR"
read -t 10 -n 1 -p "Which one do you want? $(tput setaf 2)1$(tput sgr 0)/2/3/4" mk404_choose2 read -t 10 -n 1 -p "Which one do you want? $(tput setaf 2)0$(tput sgr 0)/1/2/3/4" mk404_choose2
if [ "$mk404_choose2" == "1" ]; then if [ "$mk404_choose2" == "1" ]; then
mk404_graphics_flag=1 mk404_graphics_flag=1
elif [ "$mk404_choose2" == "2" ]; then elif [ "$mk404_choose2" == "2" ]; then
@ -1466,6 +1468,10 @@ if [[ "$output_flag" == "1" || -z "$output_flag" ]]; then
mk404_graphics_flag=3 mk404_graphics_flag=3
elif [ "$mk404_choose2" == "4" ]; then elif [ "$mk404_choose2" == "4" ]; then
mk404_graphics_flag=4 mk404_graphics_flag=4
elif [ "$mk404_choose2" == "0" ]; then
mk404_graphics_flag=""
else
mk404_graphics_flag="" #default
fi fi
fi fi
echo echo