diff options
| author | Twinaphex | 2014-12-20 20:43:18 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
| commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
| tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /Makefile | |
| parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
| parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
| download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip | |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -107,15 +107,9 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o ifeq "$(BUILTIN_GPU)" "neon" -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: 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 -endif endif ifeq "$(BUILTIN_GPU)" "peops" # note: code is not safe for strict-aliasing? (Castlevania problems) |