[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

Simon McVittie smcv at debian.org
Thu Jul 29 20:14:27 UTC 2010


The following commit has been merged in the master branch:
commit 288b4dc84e040f0f6b0bf136bdd5312e5de44dfe
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 23:49:14 2010 +0100

    Split up make options into generic, engine and game; set V=1 for buildd logs

diff --git a/debian/rules b/debian/rules
index 4101cde..eb8080d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,26 +13,30 @@ Q3COMPILE_PLATFORM := $(shell sh $(CURDIR)/debian/q3arch.sh platform BUILD)
 
 CFLAGS += -fsigned-char
 
+GENERAL_OPTIONS = \
+	V=1 \
+	ARCH=$(Q3ARCH) \
+	PLATFORM=$(Q3PLATFORM) \
+	COMPILE_ARCH=$(Q3COMPILE_ARCH) \
+	COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM)
+
 ENGINE_OPTIONS = \
-			USE_CURL=1 \
-			BUILD_GAME_SO=0 \
-			BUILD_GAME_QVM=0 \
-			BUILD_STANDALONE=1 \
-			USE_CURL_DLOPEN=0 \
-			USE_OPENAL=1 \
-			USE_OPENAL_DLOPEN=0 \
-			USE_VOIP=1 \
-			USE_INTERNAL_SPEEX=0 \
-			BUILD_CLIENT_SMP=1 \
-			USE_LOCAL_HEADERS=0 \
-			DEFAULT_BASEDIR=/usr/lib/games/openarena \
-			ARCH=$(Q3ARCH) \
-			PLATFORM=$(Q3PLATFORM) \
-			COMPILE_ARCH=$(Q3COMPILE_ARCH) \
-			COMPILE_PLATFORM=$(Q3COMPILE_PLATFORM)
+	$(GENERAL_OPTIONS) \
+	BUILD_GAME_SO=0 \
+	BUILD_GAME_QVM=0 \
+	BUILD_STANDALONE=1 \
+	USE_CURL=1 \
+	USE_CURL_DLOPEN=0 \
+	USE_OPENAL=1 \
+	USE_OPENAL_DLOPEN=0 \
+	USE_VOIP=1 \
+	USE_INTERNAL_SPEEX=0 \
+	BUILD_CLIENT_SMP=1 \
+	USE_LOCAL_HEADERS=0 \
+	DEFAULT_BASEDIR=/usr/lib/games/openarena
 
 GAME_OPTIONS = \
-	$(ENGINE_OPTIONS) \
+	$(GENERAL_OPTIONS) \
 	BUILD_CLIENT=0 \
 	BUILD_SERVER=0 \
 	BUILD_GAME_SO=1 \

-- 
Packaging for the OpenArena engine



More information about the Pkg-games-commits mailing list