X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=9f8b7772d7e18b3200d02bc381b8091e1398e84b;hp=0c7854d7d3b0e3b6e6e9dc12ac57127400672d43;hb=d57557c0644f9294e30657f0c7cf673cf2914695;hpb=a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 diff --git a/Makefile b/Makefile index 0c7854d7..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,12 +111,11 @@ 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 endif -plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 +plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) endif @@ -131,10 +126,29 @@ 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 frontend/plat_sdl.o +OBJS += frontend/libpicofe/in_sdl.o +OBJS += frontend/libpicofe/plat_sdl.o 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 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 USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif @@ -163,6 +177,7 @@ USE_PLUGIN_LIB = 1 endif ifeq "$(PLATFORM)" "libretro" OBJS += frontend/libretro.o +CFLAGS += -DFRONTEND_SUPPORTS_RGB565 endif ifeq "$(USE_PLUGIN_LIB)" "1"