diff options
| author | twinaphex | 2013-02-09 10:05:21 +0100 |
|---|---|---|
| committer | twinaphex | 2013-02-09 10:05:21 +0100 |
| commit | ad72cb33d8ef068b92a059a774dd7871d052a707 (patch) | |
| tree | f8623af5beeb8939631acceb2acb505c9497f71c /Makefile | |
| parent | 2dfdc938c99783e187f60c1d13db73e0ee434c92 (diff) | |
| parent | d57557c0644f9294e30657f0c7cf673cf2914695 (diff) | |
| download | pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.gz pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.bz2 pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -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,15 @@ 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 +else +ifeq "$(ARCH)" "arm" +OBJS += frontend/cspace_arm.o +endif +endif + ifeq "$(PLATFORM)" "generic" OBJS += frontend/libpicofe/in_sdl.o OBJS += frontend/libpicofe/plat_sdl.o |