From c82d5b4ba31ae828cae27962f1a4d328fd4ea4da Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 31 Dec 2013 04:55:09 +0100
Subject: Fixed NEON GPU plugin for PC by using stdint.h types - use NEON GPU
 plugin for non-ARM targets now

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cc19e77..6187958 100644
--- a/Makefile
+++ b/Makefile
@@ -107,9 +107,15 @@ endif
 # builtin gpu
 OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o
 ifeq "$(BUILTIN_GPU)" "neon"
-OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
+ifeq "$(HAVE_NEON)" "1"
 plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
 plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c
+OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
+else
+plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
+plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c
+OBJS += plugins/gpu_neon/psx_gpu_if.o
+endif
 endif
 ifeq "$(BUILTIN_GPU)" "peops"
 # note: code is not safe for strict-aliasing? (Castlevania problems)
-- 
cgit v1.2.3