X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=2b57053830d92cb0a721521f07e0f80dbf1c445d;hp=b95f7f214061da79b4642696f9b61a3ab5681569;hb=587fa7de9b496a0b7fa1d52d393733886602ca83;hpb=4c08b9e7dd350a48fc3e0515913d6ccc8b15e5ae diff --git a/Makefile b/Makefile index b95f7f21..2b570538 100644 --- a/Makefile +++ b/Makefile @@ -92,14 +92,16 @@ OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o # gui OBJS += frontend/main.o frontend/plugin.o +OBJS += frontend/plugin_lib.o frontend/common/readpng.o +OBJS += frontend/common/fonts.o frontend/linux/plat.o ifeq "$(USE_GTK)" "1" OBJS += maemo/hildon.o maemo/main.o maemo/%.o: maemo/%.c else -OBJS += frontend/plugin_lib.o frontend/menu.o +frontend/%.o: CFLAGS += -DVOUT_FBDEV +OBJS += frontend/menu.o OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o -OBJS += frontend/linux/plat.o frontend/linux/oshide.o -OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o +OBJS += frontend/common/input.o frontend/linux/oshide.o ifeq "$(ARCH)" "arm" OBJS += frontend/plat_omap.o OBJS += frontend/pandora.o @@ -135,7 +137,7 @@ $(TARGET): $(OBJS) $(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \ - plugins/gpu-gles/gpuGLES.so + plugins/gpu-gles/gpuGLES.so plugins/gpu_neon/gpu_neon.so $(PLUGINS): make -C $(dir $@) @@ -162,4 +164,5 @@ rel: pcsx $(PLUGINS) \ sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml rm out/pcsx.pxml.templ mv out/*.so out/plugins/ + mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so $(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c