This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 646862874ccf02f9a3d8d75de45215158ca18d27 Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Wed Nov 18 15:08:02 2015 -0500 All: Some more Makefile consolidation and cleanup --- MP/Makefile | 66 ++++++++++++++++++++++++++----------------------------------- SP/Makefile | 66 ++++++++++++++++++++++++++----------------------------------- 2 files changed, 56 insertions(+), 76 deletions(-) diff --git a/MP/Makefile b/MP/Makefile index b943bb1..9a32bef 100644 --- a/MP/Makefile +++ b/MP/Makefile @@ -378,36 +378,30 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu") ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),ppc) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),ppc64) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),sparc) OPTIMIZE += -mtune=ultrasparc3 -mv8plus OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus - HAVE_VM_COMPILED=true endif - ifeq ($(ARM_VER_CHECK),armv7l) - HAVE_VM_COMPILED=true + ifeq ($(ARCH),sparc64) + OPTIMIZE += -mtune=ultrasparc3 -mv8plus + OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus endif ifeq ($(ARCH),alpha) # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555 # -ffast-math will cause the client to die with SIGFPE on Alpha OPTIMIZE = $(OPTIMIZEVM) endif - endif - endif SHLIBEXT=so SHLIBCFLAGS=-fPIC -fvisibility=hidden @@ -469,7 +463,6 @@ else # ifeq Linux ############################################################################# ifeq ($(PLATFORM),darwin) - HAVE_VM_COMPILED=true LIBS = -framework Cocoa CLIENT_LIBS= RENDERER_LIBS= @@ -649,13 +642,11 @@ ifdef MINGW ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true FILE_ARCH=x64 endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true endif SHLIBEXT=dll @@ -751,7 +742,6 @@ ifeq ($(PLATFORM),freebsd) -Wall -fno-strict-aliasing \ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS += $(SDL_CFLAGS) - HAVE_VM_COMPILED = true OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math @@ -812,33 +802,30 @@ ifeq ($(PLATFORM),openbsd) ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),ppc) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),ppc64) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),sparc) + OPTIMIZE += -mtune=ultrasparc3 -mv8plus + OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus endif ifeq ($(ARCH),sparc64) OPTIMIZE += -mtune=ultrasparc3 -mv8plus OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),alpha) # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555 # -ffast-math will cause the client to die with SIGFPE on Alpha OPTIMIZE = $(OPTIMIZEVM) endif - endif - endif ifeq ($(USE_CURL),1) CLIENT_CFLAGS += $(CURL_CFLAGS) @@ -887,10 +874,6 @@ ifeq ($(PLATFORM),netbsd) BASE_CFLAGS = -Wall -fno-strict-aliasing - ifeq ($(ARCH),x86) - HAVE_VM_COMPILED=true - endif - BUILD_CLIENT = 0 else # ifeq netbsd @@ -948,16 +931,13 @@ ifeq ($(PLATFORM),sunos) ifeq ($(ARCH),sparc) OPTIMIZEVM += -O3 -mtune=ultrasparc3 -mv8plus -mno-faster-structs - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM += -march=i586 - HAVE_VM_COMPILED=true BASE_CFLAGS += -m32 CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA endif - endif OPTIMIZE = $(OPTIMIZEVM) -ffast-math @@ -1002,6 +982,18 @@ ifndef RANLIB RANLIB=ranlib endif +ifndef HAVE_VM_COMPILED +HAVE_VM_COMPILED = false +endif + +ifneq ($(findstring $(ARCH),x86 x86_64 ppc ppc64 sparc sparc64),) + HAVE_VM_COMPILED = true +endif + +ifeq ($(ARM_VER_CHECK),armv7l) + HAVE_VM_COMPILED = true +endif + ifneq ($(HAVE_VM_COMPILED),true) BASE_CFLAGS += -DNO_VM_COMPILED BUILD_GAME_QVM=0 @@ -2152,13 +2144,12 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifneq ($(findstring $(ARCH),x86 x86_64),) - Q3OBJ += \ - $(B)/client/vm_x86.o + Q3OBJ += $(B)/client/vm_x86.o endif ifneq ($(findstring $(ARCH),ppc ppc64),) Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o endif - ifeq ($(ARCH),sparc) + ifneq ($(findstring $(ARCH),sparc sparc64),) Q3OBJ += $(B)/client/vm_sparc.o endif ifeq ($(ARM_VER_CHECK),armv7l) @@ -2328,13 +2319,12 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifneq ($(findstring $(ARCH),x86 x86_64),) - Q3DOBJ += \ - $(B)/ded/vm_x86.o + Q3DOBJ += $(B)/ded/vm_x86.o endif ifneq ($(findstring $(ARCH),ppc ppc64),) Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o endif - ifeq ($(ARCH),sparc) + ifneq ($(findstring $(ARCH),sparc sparc64),) Q3DOBJ += $(B)/ded/vm_sparc.o endif ifeq ($(ARM_VER_CHECK),armv7l) diff --git a/SP/Makefile b/SP/Makefile index b348795..2c5b7c5 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -370,36 +370,30 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu") ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),ppc) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),ppc64) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),sparc) OPTIMIZE += -mtune=ultrasparc3 -mv8plus OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus - HAVE_VM_COMPILED=true endif - ifeq ($(ARM_VER_CHECK),armv7l) - HAVE_VM_COMPILED=true + ifeq ($(ARCH),sparc64) + OPTIMIZE += -mtune=ultrasparc3 -mv8plus + OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus endif ifeq ($(ARCH),alpha) # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555 # -ffast-math will cause the client to die with SIGFPE on Alpha OPTIMIZE = $(OPTIMIZEVM) endif - endif - endif SHLIBEXT=so SHLIBCFLAGS=-fPIC -fvisibility=hidden @@ -461,7 +455,6 @@ else # ifeq Linux ############################################################################# ifeq ($(PLATFORM),darwin) - HAVE_VM_COMPILED=true LIBS = -framework Cocoa CLIENT_LIBS= RENDERER_LIBS= @@ -641,13 +634,11 @@ ifdef MINGW ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true FILE_ARCH=x64 endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true endif SHLIBEXT=dll @@ -743,7 +734,6 @@ ifeq ($(PLATFORM),freebsd) -Wall -fno-strict-aliasing \ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS += $(SDL_CFLAGS) - HAVE_VM_COMPILED = true OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math @@ -804,33 +794,30 @@ ifeq ($(PLATFORM),openbsd) ifeq ($(ARCH),x86_64) OPTIMIZEVM = -O3 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED = true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM = -O3 -march=i586 OPTIMIZE = $(OPTIMIZEVM) -ffast-math - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),ppc) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),ppc64) BASE_CFLAGS += -maltivec - HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),sparc) + OPTIMIZE += -mtune=ultrasparc3 -mv8plus + OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus endif ifeq ($(ARCH),sparc64) OPTIMIZE += -mtune=ultrasparc3 -mv8plus OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus - HAVE_VM_COMPILED=true endif ifeq ($(ARCH),alpha) # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555 # -ffast-math will cause the client to die with SIGFPE on Alpha OPTIMIZE = $(OPTIMIZEVM) endif - endif - endif ifeq ($(USE_CURL),1) CLIENT_CFLAGS += $(CURL_CFLAGS) @@ -879,10 +866,6 @@ ifeq ($(PLATFORM),netbsd) BASE_CFLAGS = -Wall -fno-strict-aliasing - ifeq ($(ARCH),x86) - HAVE_VM_COMPILED=true - endif - BUILD_CLIENT = 0 else # ifeq netbsd @@ -940,16 +923,13 @@ ifeq ($(PLATFORM),sunos) ifeq ($(ARCH),sparc) OPTIMIZEVM += -O3 -mtune=ultrasparc3 -mv8plus -mno-faster-structs - HAVE_VM_COMPILED=true - else + endif ifeq ($(ARCH),x86) OPTIMIZEVM += -march=i586 - HAVE_VM_COMPILED=true BASE_CFLAGS += -m32 CLIENT_CFLAGS += -I/usr/X11/include/NVIDIA CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA endif - endif OPTIMIZE = $(OPTIMIZEVM) -ffast-math @@ -994,6 +974,18 @@ ifndef RANLIB RANLIB=ranlib endif +ifndef HAVE_VM_COMPILED +HAVE_VM_COMPILED = false +endif + +ifneq ($(findstring $(ARCH),x86 x86_64 ppc ppc64 sparc sparc64),) + HAVE_VM_COMPILED = true +endif + +ifeq ($(ARM_VER_CHECK),armv7l) + HAVE_VM_COMPILED = true +endif + ifneq ($(HAVE_VM_COMPILED),true) BASE_CFLAGS += -DNO_VM_COMPILED BUILD_GAME_QVM=0 @@ -2130,13 +2122,12 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifneq ($(findstring $(ARCH),x86 x86_64),) - Q3OBJ += \ - $(B)/client/vm_x86.o + Q3OBJ += $(B)/client/vm_x86.o endif ifneq ($(findstring $(ARCH),ppc ppc64),) Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o endif - ifeq ($(ARCH),sparc) + ifneq ($(findstring $(ARCH),sparc sparc64),) Q3OBJ += $(B)/client/vm_sparc.o endif ifeq ($(ARM_VER_CHECK),armv7l) @@ -2302,13 +2293,12 @@ endif ifeq ($(HAVE_VM_COMPILED),true) ifneq ($(findstring $(ARCH),x86 x86_64),) - Q3DOBJ += \ - $(B)/ded/vm_x86.o + Q3DOBJ += $(B)/ded/vm_x86.o endif ifneq ($(findstring $(ARCH),ppc ppc64),) Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o endif - ifeq ($(ARCH),sparc) + ifneq ($(findstring $(ARCH),sparc sparc64),) Q3DOBJ += $(B)/ded/vm_sparc.o endif ifeq ($(ARM_VER_CHECK),armv7l) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits