aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authornotaz2013-02-08 02:05:48 +0200
committernotaz2013-02-08 02:05:48 +0200
commitc82f907a99f7d0d3071471489d247f4b4394a8b7 (patch)
treef807cdc8edf8a83086d6eee32b04428ac91dd2f0 /Makefile
parent955f9af0395a7fa2bba0d1c3a4e6ef5d3e111dae (diff)
downloadpcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.tar.gz
pcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.tar.bz2
pcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.zip
move cspace back to frontend
plugins no longer depend on it
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 0d72dea..b6f381c 100644
--- a/Makefile
+++ b/Makefile
@@ -99,10 +99,6 @@ endif
# builtin gpu
OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o
-OBJS += plugins/gpulib/cspace.o
-ifeq "$(HAVE_NEON)" "1"
-OBJS += plugins/gpulib/cspace_neon.o
-endif
ifeq "$(BUILTIN_GPU)" "neon"
OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
@@ -115,7 +111,6 @@ plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c
OBJS += plugins/dfxvideo/gpulib_if.o
endif
ifeq "$(BUILTIN_GPU)" "unai"
-OBJS += plugins/gpulib/cspace.o
OBJS += plugins/gpu_unai/gpulib_if.o
ifeq "$(ARCH)" "arm"
OBJS += plugins/gpu_unai/gpu_arm.o
@@ -131,6 +126,11 @@ OBJS += plugins/cdrcimg/cdrcimg.o
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
# frontend/gui
+OBJS += frontend/cspace.o
+ifeq "$(HAVE_NEON)" "1"
+OBJS += frontend/cspace_neon.o
+endif
+
ifeq "$(PLATFORM)" "generic"
OBJS += frontend/libpicofe/in_sdl.o
OBJS += frontend/libpicofe/plat_sdl.o