From 768617a1292465dac13656c2a7c706304fbf76e8 Mon Sep 17 00:00:00 2001 From: jfreegman Date: Mon, 28 Jun 2021 16:04:25 -0400 Subject: [PATCH] Fix small build bug and bump to v0.11.1 --- apidoc/python/source/conf.py | 4 ++-- cfg/checks/check_features.mk | 5 ++--- cfg/global_vars.mk | 2 +- script/build-minimal-static-toxic.sh | 8 +++++--- src/game_util.h | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apidoc/python/source/conf.py b/apidoc/python/source/conf.py index 2dd0207..713a4e4 100644 --- a/apidoc/python/source/conf.py +++ b/apidoc/python/source/conf.py @@ -55,9 +55,9 @@ author = 'Jakob Kreuze' # built documents. # # The short X.Y version. -version = '0.11.0' +version = '0.11.1' # The full version, including alpha/beta/rc tags. -release = '0.11.0' +release = '0.11.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/cfg/checks/check_features.mk b/cfg/checks/check_features.mk index af491e6..2714c2b 100644 --- a/cfg/checks/check_features.mk +++ b/cfg/checks/check_features.mk @@ -19,6 +19,8 @@ ifneq ($(AUDIO), disabled) ifneq ($(VIDEO), disabled) -include $(CHECKS_DIR)/video.mk endif +endif +endif #check if we want to build with game support GAMES := $(shell if [ -z "$(DISABLE_GAMES)" ] || [ "$(DISABLE_GAMES)" = "0" ] ; then echo enabled ; else echo disabled ; fi) @@ -26,9 +28,6 @@ ifneq ($(GAMES), disabled) -include $(CHECKS_DIR)/games.mk endif -endif -endif - # Check if we want build sound notifications support SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi) ifneq ($(SND_NOTIFY), disabled) diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk index 7d27297..9831eff 100644 --- a/cfg/global_vars.mk +++ b/cfg/global_vars.mk @@ -1,5 +1,5 @@ # Version -TOXIC_VERSION = 0.11.0 +TOXIC_VERSION = 0.11.1 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error") ifneq (, $(findstring error, $(REV))) VERSION = $(TOXIC_VERSION) diff --git a/script/build-minimal-static-toxic.sh b/script/build-minimal-static-toxic.sh index 4dbd452..fd03602 100755 --- a/script/build-minimal-static-toxic.sh +++ b/script/build-minimal-static-toxic.sh @@ -131,11 +131,11 @@ mkdir -p "$BUILD_DIR" # Build Toxcore cd "$BUILD_DIR" -TOXCORE_VERSION="0.2.12" -TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0" +TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29" +TOXCORE_HASH="78749dccfd2e6ec95d59d7a07c882aa034754a9ff62113b95281927e71b42574" TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz" -wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/v$TOXCORE_VERSION.tar.gz" +wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/master.tar.gz" check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME" tar -o -xf "$TOXCORE_FILENAME" rm "$TOXCORE_FILENAME" @@ -214,6 +214,7 @@ CFLAGS="-static" PKG_CONFIG_PATH="$BUILD_DIR/prefix-toxcore/lib64/pkgconfig:$BUI ENABLE_PYTHON=0 \ ENABLE_RELEASE=1 \ ENABLE_ASAN=0 \ + DISABLE_GAMES=0 \ install @@ -295,3 +296,4 @@ mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME" tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME" mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR" chmod 777 -R "$ARTIFACT_DIR" + diff --git a/src/game_util.h b/src/game_util.h index 7ceb680..c51daef 100644 --- a/src/game_util.h +++ b/src/game_util.h @@ -24,6 +24,7 @@ #define GAME_UTIL #include +#include typedef struct Coords { int x;