X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=9f8b7772d7e18b3200d02bc381b8091e1398e84b;hp=a3cd3b205ec394b7b04e834e572e4939dfd7d034;hb=d57557c0644f9294e30657f0c7cf673cf2914695;hpb=5b9aa74918361ff5d306c39cb695a77d7ea40b8f diff --git a/Makefile b/Makefile index a3cd3b20..9f8b7772 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,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 @@ -138,9 +142,10 @@ OBJS += frontend/libpicofe/plat_dummy.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_sdl.o ifeq "$(HAVE_GLES)" "1" -OBJS += frontend/libpicofe/gl.o +OBJS += frontend/libpicofe/gl.o frontend/libpicofe/gl_platform.o LDLIBS += $(LDLIBS_GLES) frontend/libpicofe/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl_platform.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) frontend/libpicofe/gl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) frontend/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) endif