summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Edgecombe2015-09-19 18:16:10 +0100
committerGraham Edgecombe2015-09-19 18:16:34 +0100
commitceb106610d930e748a116d75f13a54473f825373 (patch)
treeaad4ffd24a7391e26d54175ef564e94f56cd148b
parent21fb330cf54fdb797dcee80904a7a170734a0f06 (diff)
downloadaur-ceb106610d930e748a116d75f13a54473f825373.tar.gz
Fix disabling Twitch support.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD14
2 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abc7ac3eec0d..5c82d42baa6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openrct2-git
pkgdesc = Open source clone of RollerCoaster Tycoon 2
- pkgver = r4403.f16b740
+ pkgver = r4510.cc01e74
pkgrel = 1
url = https://github.com/IntelOrca/OpenRCT2
install = openrct2.install
diff --git a/PKGBUILD b/PKGBUILD
index 102227ba7cc4..d67f1cc77997 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Graham Edgecombe <graham@grahamedgecombe.com>
pkgname=openrct2-git
-pkgver=r4403.f16b740
+pkgver=r4510.cc01e74
pkgrel=1
pkgdesc='Open source clone of RollerCoaster Tycoon 2'
arch=('any')
@@ -55,17 +55,17 @@ prepare() {
# /usr/i686-w64-mingw32/include.
find src \( -name '*.c' -or -name '*.h' -or -name '*.cpp' \) \
-exec sed -i 's@#include <jansson/@#include <@' {} \;
-
- # Set DISABLE_HTTP and DISABLE_TWITCH if we don't want Twitch support.
- if [ $_enable_twitch -ne 1 ]; then
- sed -i 's@#add_definitions(-DDISABLE_HTTP -DDISABLE_TWITCH)@add_definitions(-DDISABLE_HTTP -DDISABLE_TWITCH)@' CMakeLists.txt
- fi
}
build() {
cd "$srcdir/$pkgname"
- cmake -DCMAKE_TOOLCHAIN_FILE=CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug .
+ local opts=''
+ if [ $_enable_twitch -ne 1 ]; then
+ opts+='-DDISABLE_HTTP_TWITCH=1'
+ fi
+
+ cmake -DCMAKE_TOOLCHAIN_FILE=CMakeLists_mingw.txt -DCMAKE_BUILD_TYPE=Debug $opts .
make
# Create g2.dat. See the comment in the package() function for why we need to