From b78edec75aea5e9015e11dd71f7736d7e92b347b Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 2 Jan 2012 18:38:45 +0200
Subject: gpu_neon: fix x86 build

---
 plugins/gpu_neon/Makefile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'plugins/gpu_neon/Makefile')

diff --git a/plugins/gpu_neon/Makefile b/plugins/gpu_neon/Makefile
index 419558f..2d942f8 100644
--- a/plugins/gpu_neon/Makefile
+++ b/plugins/gpu_neon/Makefile
@@ -32,17 +32,23 @@ endif
 
 HAVE_NEON = $(shell $(CC_) -E -dD $(CFLAGS) gpu.h | grep -q '__ARM_NEON__ 1' && echo 1)
 
-TARGETS = gpu_peops.$(EXT) gpu_unai.$(EXT)
+TARGETS = gpu_neon.$(EXT) gpu_peops.$(EXT) gpu_unai.$(EXT)
+
+gpu_neon.$(EXT): SRC += psx_gpu_if.c
+gpu_neon.$(EXT): CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 ifeq "$(HAVE_NEON)" "1"
-TARGETS += gpu_neon.$(EXT)
+gpu_neon.$(EXT): SRC += psx_gpu/psx_gpu_arm_neon.S
+gpu_neon.$(EXT): CFLAGS += -DNEON_BUILD
+else
+gpu_neon.$(EXT): CFLAGS += -fno-strict-aliasing
 endif
-
-gpu_neon.$(EXT): SRC += psx_gpu_if.c psx_gpu/psx_gpu_arm_neon.S
-gpu_neon.$(EXT): CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 gpu_peops.$(EXT): SRC += peops_if.c
 gpu_peops.$(EXT): CFLAGS += -fno-strict-aliasing
-gpu_unai.$(EXT): SRC += unai_if.cpp ../gpu_unai/gpu_arm.s
+gpu_unai.$(EXT): SRC += unai_if.cpp
 gpu_unai.$(EXT): CC_ = $(CXX)
+ifeq "$(ARCH)" "arm"
+gpu_unai.$(EXT): SRC += ../gpu_unai/gpu_arm.s
+endif
 
 all: $(TARGETS)
 
-- 
cgit v1.2.3