This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 9eb36692d2a44738d57bfbfd75dcec1eeb5f90cc Author: Sven Eckelmann <[email protected]> Date: Sun Dec 2 21:31:05 2012 +0100 Imported Upstream version 1.99.5+6+6f95516f85f0 --- projects/unix/Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/unix/Makefile b/projects/unix/Makefile index 43f2465..3bbe886 100644 --- a/projects/unix/Makefile +++ b/projects/unix/Makefile @@ -83,7 +83,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","") ARCH_DETECTED := 32BITS PIC ?= 0 endif -ifneq ("$(filter ppc powerpc,$(HOST_CPU))","") +ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","") CPU := PPC ARCH_DETECTED := 32BITS BIG_ENDIAN := 1 @@ -99,16 +99,29 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","") NO_ASM := 1 $(warning Architecture "$(HOST_CPU)" not officially supported.') endif +ifneq ("$(filter arm%,$(HOST_CPU))","") + ifeq ("$(filter arm%b,$(HOST_CPU))","") + CPU := ARM + ARCH_DETECTED := 32BITS + PIC ?= 1 + NO_ASM := 1 + $(warning Architecture "$(HOST_CPU)" not officially supported.') + endif +endif ifeq ("$(CPU)","NONE") $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues') endif # base CFLAGS, LDLIBS, and LDFLAGS OPTFLAGS ?= -O3 -CFLAGS += $(OPTFLAGS) -Wall -msse -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src +CFLAGS += $(OPTFLAGS) -Wall -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src CXXFLAGS += -fvisibility-inlines-hidden LDFLAGS += $(SHARED) +ifeq ($(CPU), "X86") + CFLAGS += -msse +endif + # Since we are building a shared library, we must compile with -fPIC on some architectures # On 32-bit x86 systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch ifeq ($(PIC), 1) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
