tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

build_engine.sh: We're gonna migrate to git, whether some people want to or not.

This commit is contained in:
Marco Cawthorne 2022-11-25 16:54:36 -08:00
parent 29a1bea943
commit e2f708138d
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/src/server/client.qc
View File

@ -18,7 +18,6 @@
void void
Game_RunClientCommand(void) Game_RunClientCommand(void)
{ {
Footsteps_Update();
player pl = (player)self; player pl = (player)self;
pl.Physics_Run(); pl.Physics_Run();
} }

5
base/src/shared/player.qc
View File

@ -29,12 +29,9 @@ enumflags
class player:NSClientPlayer class player:NSClientPlayer
{ {
PREDICTED_INT(mode_tempstate); PREDICTED_INT(mode_tempstate)
#ifdef CLIENT #ifdef CLIENT
virtual void(void) draw;
virtual float() predraw;
virtual void(void) postdraw;
virtual void(float,float) ReceiveEntity; virtual void(float,float) ReceiveEntity;
virtual void(void) PredictPreFrame; virtual void(void) PredictPreFrame;
virtual void(void) PredictPostFrame; virtual void(void) PredictPostFrame;

2
build.cfg
View File

@ -32,7 +32,7 @@ BUILD_IQMTOOL=1
BUILD_IMGTOOL=1 BUILD_IMGTOOL=1
# Specify which engine revision to build, these are considered 'stable'; 0 = latest # Specify which engine revision to build, these are considered 'stable'; 0 = latest
BUILD_ENGINEREVISION=6306 BUILD_ENGINEREVISION=git
# Whether or not to run 'git pull' or 'svn up' before building a component # Whether or not to run 'git pull' or 'svn up' before building a component
BUILD_UPDATE=1 BUILD_UPDATE=1

31
build_engine.sh
View File

@ -1,15 +1,17 @@
#!/bin/sh #!/bin/sh
. ./build.cfg . ./build.cfg
if ! [ -x "$(command -v svn)" ] if ! [ -x "$(command -v git)" ]
then then
printf "'svn' is not installed.\n" printf "'git' is not installed.\n"
exit exit
fi fi
set -e set -e
FTE_MAKEFILE=./src/engine/engine/Makefile FTE_MAKEFILE=./src/engine/engine/Makefile
FTE_SVNDIR=./src/engine/.svn
COMPILE_SYS=$(uname) COMPILE_SYS=$(uname)
COMPILE_OS=$(uname -o) COMPILE_OS=$(uname -o)
@ -103,6 +105,13 @@ fi
mkdir -p ./bin mkdir -p ./bin
# SVN is no more
if [ -d "$FTE_SVNDIR" ]
then
printf "Detected Subversion repo... Please remove ./src/engine before proceeding."
exit
fi
if [ -f "$FTE_MAKEFILE" ] if [ -f "$FTE_MAKEFILE" ]
then then
if [ "$BUILD_UPDATE" -eq 1 ] if [ "$BUILD_UPDATE" -eq 1 ]
@ -110,11 +119,13 @@ then
printf "Engine is present, updating...\n" printf "Engine is present, updating...\n"
cd ./src/engine/ cd ./src/engine/
if [ "$BUILD_ENGINEREVISION" -eq 0 ] if [ -z "$(git status --untracked-files=no --porcelain)" ]
then then
svn up # TODO: let devs decide to fetch changes instead first
else git pull --rebase
svn -r $BUILD_ENGINEREVISION up else
# Uncommitted changes
printf "You have uncommitted changes. Will not pull --rebase.\n"
fi fi
cd ./engine cd ./engine
@ -124,13 +135,7 @@ then
else else
printf "Engine is NOT present, cloning...\n" printf "Engine is NOT present, cloning...\n"
cd ./src/ cd ./src/
git clone "https://github.com/VeraVisions/fteqw" engine
if [ "$BUILD_ENGINEREVISION" -eq 0 ]
then
svn checkout https://svn.code.sf.net/p/fteqw/code/trunk engine
else
svn -r $BUILD_ENGINEREVISION checkout https://svn.code.sf.net/p/fteqw/code/trunk engine
fi
cd ./engine/engine cd ./engine/engine
fi fi