[ioquake3] 104/136: Windows support for autoupdater manifest signatures.
Simon McVittie
smcv at debian.org
Thu Jun 15 09:09:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit a761684a2356ddac693697e758ce3232af69a395
Author: Ryan C. Gordon <icculus at icculus.org>
Date: Sun Jun 4 02:21:55 2017 -0400
Windows support for autoupdater manifest signatures.
---
Makefile | 8 +++++---
code/autoupdater/rsa_tools/build-rsa-tools.sh | 16 +++++++++++-----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index b5be770..a048ba9 100644
--- a/Makefile
+++ b/Makefile
@@ -378,7 +378,7 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
THREAD_LIBS=-lpthread
LIBS=-ldl -lm
- AUTOUPDATER_LIBS += -ldl $(LIBTOMCRYPTSRCDIR)/libtomcrypt.a $(TOMSFASTMATHSRCDIR)/libtfm.a
+ AUTOUPDATER_LIBS += -ldl
CLIENT_LIBS=$(SDL_LIBS)
RENDERER_LIBS = $(SDL_LIBS) -lGL
@@ -421,8 +421,6 @@ ifeq ($(PLATFORM),darwin)
RENDERER_LIBS=
OPTIMIZEVM=
- AUTOUPDATER_LIBS += $(LIBTOMCRYPTSRCDIR)/libtomcrypt.a $(TOMSFASTMATHSRCDIR)/libtfm.a
-
# Default minimum Mac OS X version
ifeq ($(MACOSX_VERSION_MIN),)
MACOSX_VERSION_MIN=10.7
@@ -1120,6 +1118,10 @@ ifeq ($(USE_AUTOUPDATER),1)
SERVER_CFLAGS += -DUSE_AUTOUPDATER -DAUTOUPDATER_BIN=\\\"$(AUTOUPDATER_BIN)\\\"
endif
+ifeq ($(BUILD_AUTOUPDATER),1)
+ AUTOUPDATER_LIBS += $(LIBTOMCRYPTSRCDIR)/libtomcrypt.a $(TOMSFASTMATHSRCDIR)/libtfm.a
+endif
+
ifeq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
BASE_CFLAGS += -Qunused-arguments
endif
diff --git a/code/autoupdater/rsa_tools/build-rsa-tools.sh b/code/autoupdater/rsa_tools/build-rsa-tools.sh
index 23e65c6..dda9396 100755
--- a/code/autoupdater/rsa_tools/build-rsa-tools.sh
+++ b/code/autoupdater/rsa_tools/build-rsa-tools.sh
@@ -1,16 +1,22 @@
#!/bin/bash
-# You don't need these to be built with the autoupdater, so here's a simple
-# shell file to make them on a Mac.
-
export TFMDIR="tomsfastmath-0.13.1"
export LTCDIR="libtomcrypt-1.17"
+OSTYPE=`uname -s`
+if [ -z "$CC" ]; then
+ if [ "`uname -o`" = "Cygwin" ]; then
+ export CC=/usr/bin/i686-w64-mingw32-gcc
+ else
+ export CC=cc
+ fi
+fi
+
function build {
if [ "$OSTYPE" = "Darwin" ]; then
- clang -mmacosx-version-min=10.7 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070 -I $TFMDIR/src/headers -I $LTCDIR/src/headers -o "$1" -Wall -O3 "$1.c" rsa_common.c $LTCDIR/libtomcrypt.a $TFMDIR/libtfm.a
+ $CC -mmacosx-version-min=10.7 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070 -I $TFMDIR/src/headers -I $LTCDIR/src/headers -o "$1" -Wall -O3 "$1.c" rsa_common.c $LTCDIR/libtomcrypt.a $TFMDIR/libtfm.a
else
- gcc -I $TFMDIR/src/headers -I $LTCDIR/src/headers -o "$1" -Wall -O3 "$1.c" rsa_common.c $LTCDIR/libtomcrypt.a $TFMDIR/libtfm.a
+ $CC -I $TFMDIR/src/headers -I $LTCDIR/src/headers -o "$1" -Wall -O3 "$1.c" rsa_common.c $LTCDIR/libtomcrypt.a $TFMDIR/libtfm.a
fi
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list