mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-14 18:53:04 +01:00
Fix small build bug and bump to v0.11.1
This commit is contained in:
parent
8dfd009e0e
commit
768617a129
@ -55,9 +55,9 @@ author = 'Jakob Kreuze'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '0.11.0'
|
version = '0.11.1'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# 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
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
@ -19,6 +19,8 @@ ifneq ($(AUDIO), disabled)
|
|||||||
ifneq ($(VIDEO), disabled)
|
ifneq ($(VIDEO), disabled)
|
||||||
-include $(CHECKS_DIR)/video.mk
|
-include $(CHECKS_DIR)/video.mk
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
#check if we want to build with game support
|
#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)
|
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
|
-include $(CHECKS_DIR)/games.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Check if we want build sound notifications support
|
# 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)
|
SND_NOTIFY := $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
|
||||||
ifneq ($(SND_NOTIFY), disabled)
|
ifneq ($(SND_NOTIFY), disabled)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Version
|
# Version
|
||||||
TOXIC_VERSION = 0.11.0
|
TOXIC_VERSION = 0.11.1
|
||||||
REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
|
REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
|
||||||
ifneq (, $(findstring error, $(REV)))
|
ifneq (, $(findstring error, $(REV)))
|
||||||
VERSION = $(TOXIC_VERSION)
|
VERSION = $(TOXIC_VERSION)
|
||||||
|
@ -131,11 +131,11 @@ mkdir -p "$BUILD_DIR"
|
|||||||
# Build Toxcore
|
# Build Toxcore
|
||||||
cd "$BUILD_DIR"
|
cd "$BUILD_DIR"
|
||||||
|
|
||||||
TOXCORE_VERSION="0.2.12"
|
TOXCORE_VERSION="25a56c354937e9c8c4c50a64c3b4cfc099c34e29"
|
||||||
TOXCORE_HASH="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
|
TOXCORE_HASH="78749dccfd2e6ec95d59d7a07c882aa034754a9ff62113b95281927e71b42574"
|
||||||
TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
|
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"
|
check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
|
||||||
tar -o -xf "$TOXCORE_FILENAME"
|
tar -o -xf "$TOXCORE_FILENAME"
|
||||||
rm "$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_PYTHON=0 \
|
||||||
ENABLE_RELEASE=1 \
|
ENABLE_RELEASE=1 \
|
||||||
ENABLE_ASAN=0 \
|
ENABLE_ASAN=0 \
|
||||||
|
DISABLE_GAMES=0 \
|
||||||
install
|
install
|
||||||
|
|
||||||
|
|
||||||
@ -295,3 +296,4 @@ mv "$PREPARE_ARTIFACT_DIR" "$PREPARE_ARTIFACT_DIR/../$ARTIFACT_NAME"
|
|||||||
tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME"
|
tar -cJf "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_NAME"
|
||||||
mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR"
|
mv "$ARTIFACT_NAME.tar.xz" "$ARTIFACT_DIR"
|
||||||
chmod 777 -R "$ARTIFACT_DIR"
|
chmod 777 -R "$ARTIFACT_DIR"
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#define GAME_UTIL
|
#define GAME_UTIL
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
typedef struct Coords {
|
typedef struct Coords {
|
||||||
int x;
|
int x;
|
||||||
|
Loading…
Reference in New Issue
Block a user