From df3e8fa719c976fbab2d42c9ad5e528efa408632 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 3 Jun 2018 09:46:41 +0000 Subject: [PATCH] Some bugfixes. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5259 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- build_setup.sh | 12 ++++++------ engine/Makefile | 13 ++++++++++++- engine/client/pr_csqc.c | 2 +- engine/common/com_mesh.c | 1 + 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/build_setup.sh b/build_setup.sh index c4663397a..c8557a95a 100755 --- a/build_setup.sh +++ b/build_setup.sh @@ -205,7 +205,7 @@ function debianpackages { apt-get install --no-install-recommends $@ ret=$true else - echo "Packages not installed. Run as root to easily install dependancies." + echo "Packages not installed. Rerun script as root to easily install dependancies, or manually install." fi fi return $ret @@ -238,11 +238,11 @@ if [ $UID -eq 0 ] && [ ! -z `which apt-get` ]; then fi #generic crap. much of this is needed to set up and decompress dependancies and stuff. -debianpackages subversion make automake libtool p7zip-full zip || otherpackages z7 make svn || exit +debianpackages subversion make automake libtool p7zip-full zip ca-certificates || otherpackages z7 make svn || exit if [ "$BUILD_LINUXx86" == "y" ]; then #for building linux targets - debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit + debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit if [[ "$PLUGINS_LINUXx86" =~ "ffmpeg" ]]; then debianpackages libswscale-dev libavcodec-dev || otherpackages || exit @@ -250,7 +250,7 @@ if [ "$BUILD_LINUXx86" == "y" ]; then fi if [ "$BUILD_LINUXx64" == "y" ]; then #for building linux targets - debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit + debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit if [[ "$PLUGINS_LINUXx64" =~ "ffmpeg" ]]; then debianpackages libswscale-dev libavcodec-dev || otherpackages || exit @@ -258,12 +258,12 @@ if [ "$BUILD_LINUXx64" == "y" ]; then fi if [ "$BUILD_LINUXx32" == "y" ]; then #for building linux targets - debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev || otherpackages gcc || exit + debianpackages gcc-multilib g++-multilib mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit fi if [ "$BUILD_LINUXarmhf" == "y" ]; then #for building linux targets - debianpackages gcc-multilib-arm-linux-gnueabihf g++-multilib-arm-linux-gnueabihf mesa-common-dev libasound2-dev || otherpackages gcc || exit + debianpackages gcc-multilib-arm-linux-gnueabihf g++-multilib-arm-linux-gnueabihf mesa-common-dev libasound2-dev libxcursor-dev || otherpackages gcc || exit jessiepackages libgnutls28-dev || debianpackages libgnutls28-dev || otherpackages gcc || exit fi if [ "$BUILD_SDL" == "y" ]; then diff --git a/engine/Makefile b/engine/Makefile index 77f235287..acc44e2c9 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1292,7 +1292,18 @@ ifneq (,$(findstring linux,$(FTE_TARGET))) SV_LDFLAGS= SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -DMULTITHREAD - CL_CFLAGS=-DMULTITHREAD -DDYNAMIC_SDL -DUSE_EGL -DWAYLANDQUAKE -DX11QUAKE + ifneq ("$(wildcard $(/usr/include/wayland-client.h))","") + HAVE_WAYLAND=-DWAYLANDQUAKE + else + HAVE_WAYLAND= + endif + ifneq ("$(wildcard $(/usr/include/EGL/egl.h))","") + HAVE_EGL=-DUSE_EGL + else + HAVE_EGL= + endif + + CL_CFLAGS=-DMULTITHREAD -DDYNAMIC_SDL $(HAVE_EGL) $(HAVE_WAYLAND) -DX11QUAKE QCC_DIR=linqcc$(BITS) diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c index 5ef6d0f83..77c0a9841 100644 --- a/engine/client/pr_csqc.c +++ b/engine/client/pr_csqc.c @@ -3385,6 +3385,7 @@ static void cs_get_input_state (usercmd_t *cmd) static void QCBUILTIN PF_cs_getinputstate (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals) { usercmd_t *cmd; + usercmd_t tmp; extern usercmd_t cl_pendingcmd[MAX_SPLITS]; int f = G_FLOAT(OFS_PARM0); int seat = ((prinst->callargc>1)?G_FLOAT(OFS_PARM1):csqc_playerseat); @@ -3406,7 +3407,6 @@ static void QCBUILTIN PF_cs_getinputstate (pubprogfuncs_t *prinst, struct global if (f == cl.movesequence) { int i; - usercmd_t tmp; cmd = &cl_pendingcmd[seat]; tmp = *cmd; diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c index f6130b995..ff1db656e 100644 --- a/engine/common/com_mesh.c +++ b/engine/common/com_mesh.c @@ -1609,6 +1609,7 @@ qboolean Alias_GAliasBuildMesh(mesh_t *mesh, vbo_t **vbop, galiasinfo_t *inf, in if (meshcache.coords) BZ_Free(meshcache.coords); meshcache.coords = BZ_Malloc(sizeof(*meshcache.coords)*inf->numverts); + memset(meshcache.coords, 0, sizeof(*meshcache.coords)*inf->numverts); //vecV_t is often uninitialised. meshcache.numcoords = inf->numverts; }