Skip to content

Commit 768617a

Browse files
committed
Fix small build bug and bump to v0.11.1
1 parent 8dfd009 commit 768617a

5 files changed

Lines changed: 11 additions & 9 deletions

File tree

apidoc/python/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '0.11.0'
58+
version = '0.11.1'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '0.11.0'
60+
release = '0.11.1'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

cfg/checks/check_features.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ ifneq ($(AUDIO), disabled)
1919
ifneq ($(VIDEO), disabled)
2020
-include $(CHECKS_DIR)/video.mk
2121
endif
22+
endif
23+
endif
2224

2325
#check if we want to build with game support
2426
GAMES := $(shell if [ -z "$(DISABLE_GAMES)" ] || [ "$(DISABLE_GAMES)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
2527
ifneq ($(GAMES), disabled)
2628
-include $(CHECKS_DIR)/games.mk
2729
endif
2830

29-
endif
30-
endif
31-
3231
# Check if we want build sound notifications support
3332
SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
3433
ifneq ($(SND_NOTIFY), disabled)

cfg/global_vars.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Version
2-
TOXIC_VERSION = 0.11.0
2+
TOXIC_VERSION = 0.11.1
33
REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
44
ifneq (, $(findstring error, $(REV)))
55
VERSION = $(TOXIC_VERSION)

script/build-minimal-static-toxic.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ mkdir -p "$BUILD_DIR"
131131
# Build Toxcore
132132
cd "$BUILD_DIR"
133133

134-
TOXCORE_VERSION="0.2.12"
135-
TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
134+
TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
135+
TOXCORE_HASH="78749dccfd2e6ec95d59d7a07c882aa034754a9ff62113b95281927e71b42574"
136136
TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
137137

138-
wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/v$TOXCORE_VERSION.tar.gz"
138+
wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/master.tar.gz"
139139
check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
140140
tar -o -xf "$TOXCORE_FILENAME"
141141
rm "$TOXCORE_FILENAME"
@@ -214,6 +214,7 @@ CFLAGS="-static" PKG_CONFIG_PATH="$BUILD_DIR/prefix-toxcore/lib64/pkgconfig:$BUI
214214
ENABLE_PYTHON=0 \
215215
ENABLE_RELEASE=1 \
216216
ENABLE_ASAN=0 \
217+
DISABLE_GAMES=0 \
217218
install
218219

219220

@@ -295,3 +296,4 @@ mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME"
295296
tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME"
296297
mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR"
297298
chmod 777 -R "$ARTIFACT_DIR"
299+

src/game_util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define GAME_UTIL
2525

2626
#include <stdbool.h>
27+
#include <time.h>
2728

2829
typedef struct Coords {
2930
int x;

0 commit comments

Comments
 (0)