Switch from iqmtool to vvmtool.

This commit is contained in:
Marco Cawthorne 2021-08-10 12:07:09 +02:00
parent c7004625ae
commit fbf6ee7367
4 changed files with 51 additions and 8 deletions

View File

@ -3,3 +3,4 @@
./get_gamepacks.sh
./build_game.sh
./build_editor.sh
./build_tools.sh

View File

@ -102,13 +102,6 @@ gmake -j $BUILD_PROC qcc-rel
cp -v ./release/fteqcc ../../../bin/fteqcc
printf "Built the QuakeC compiler successfully.\n\n"
if [ "$BUILD_IQMTOOL" -eq 1 ]; then
gmake -j $BUILD_PROC iqm-rel
cp -v ./release/iqmtool ../../../bin/iqmtool
printf "Built the iqmtool successfully.\n\n"
fi
if [ "$BUILD_IMGTOOL" -eq 1 ]; then
gmake -j $BUILD_PROC imgtool-rel
cp -v ./release/imgtool ../../../bin/imgtool

50
build_tools.sh Executable file
View File

@ -0,0 +1,50 @@
#!/bin/sh
. ./build.cfg
if ! [ -x "$(command -v git)" ]; then
printf "'git' is not installed.\n"
exit
fi
set -e
VVM_MAKEFILE=./src/vvmtool/Makefile
COMPILE_SYS=$(uname)
# Check how many cores/processors we should use for building
if ! [ -x "$(command -v nproc)" ]; then
# check if we're on OpenBSD then
if ! [ -x "$(command -v sysctl)" ]; then
BUILD_PROC=1
else
BUILD_PROC=$(sysctl -n hw.ncpu)
fi
else
BUILD_PROC=$(nproc)
fi
mkdir -p ./bin
if [ -f "$VVM_MAKEFILE" ]; then
if [ "$BUILD_UPDATE" -eq 1 ]; then
printf "vvmtool is present, updating...\n"
cd ./src/vvmtool
git pull
else
cd ./src/vvmtool
fi
else
printf "vvmtool is NOT present, cloning...\n"
cd ./src/
git clone https://github.com/VeraVisions/vvmtool
cd ./vvmtool
fi
if [ "$BUILD_CLEAN" -eq 1 ]; then
gmake clean
fi
gmake -j $BUILD_PROC
printf "Built vvmtool successfully.\n"
cp -v vvm ../../bin/vvm
printf "DONE. Built ALL components successfully.\n"

View File

@ -384,7 +384,6 @@ menu_main_draw(void)
vector ofs = drawgetimagesize(g_bmp[LOGO_STATIC]);
drawpic([g_menuofs[0] + 320 - (ofs[0] / 2),g_menuofs[1] + 48], g_bmp[LOGO_STATIC],
ofs, [1,1,1], 1.0f);
}
Widget_Draw(fn_main);