[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:13:46 UTC 2010


The following commit has been merged in the master branch:
commit 0aaa3b3ab4ff3a5e744074aed2d9ee26626bc846
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 21:40:55 2010 +0100

    Only build the native-code game objects in game/, not in engine/

diff --git a/debian/rules b/debian/rules
index 492850b..4101cde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ CFLAGS += -fsigned-char
 
 ENGINE_OPTIONS = \
 			USE_CURL=1 \
-			BUILD_GAME_SO=1 \
+			BUILD_GAME_SO=0 \
 			BUILD_GAME_QVM=0 \
 			BUILD_STANDALONE=1 \
 			USE_CURL_DLOPEN=0 \
@@ -35,6 +35,7 @@ GAME_OPTIONS = \
 	$(ENGINE_OPTIONS) \
 	BUILD_CLIENT=0 \
 	BUILD_SERVER=0 \
+	BUILD_GAME_SO=1 \
 	CROSS_COMPILING=1
 
 build: build-stamp
@@ -48,7 +49,8 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	$(MAKE) distclean
+	rm -rf engine/build
+	rm -rf game/build
 	rm -f debian/openarena32.xpm
 	dh_clean
 
@@ -63,9 +65,9 @@ install: build
 		debian/tmp/usr/games/openarena
 	install engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/oa_ded.$(Q3ARCH) \
 		debian/tmp/usr/games/openarena-server
-	install -m644 engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseoa/*.so \
+	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/baseq3/*.so \
 		debian/tmp/usr/lib/games/openarena/baseoa/
-	install -m644 engine/build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
+	install -m644 game/build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\
 		debian/tmp/usr/lib/games/openarena/missionpack/
 	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
 	dh_install

-- 
Packaging for the OpenArena engine



More information about the Pkg-games-commits mailing list