X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=5739ef8d0970a4ebcacd2eccefbcc007d090f305;hp=141929a48fe188e7dac97b0a087d4ac4139c7605;hb=38c2028e228dcf17f3b4b0ac7e6984d1e1c6df79;hpb=6469a8c407ff23af8b7a6218f759b368eec7c339

diff --git a/Makefile b/Makefile
index 141929a4..5739ef8d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ endif
 #DRC_DBG = 1
 #PCNT = 1
 
-all: config.mak $(TARGET)
+all: config.mak target_ plugins_
 
 ifneq ($(wildcard config.mak),)
 config.mak: ./configure
@@ -39,6 +39,7 @@ endif
 ifeq "$(HAVE_NEON)" "1"
 OBJS += libpcsxcore/gte_neon.o
 endif
+libpcsxcore/gte.o libpcsxcore/gte_nf.o: CFLAGS += -fno-strict-aliasing
 libpcsxcore/cdrom.o libpcsxcore/misc.o: CFLAGS += -Wno-pointer-sign
 libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 
@@ -110,28 +111,43 @@ 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 "$(PLATFORM)" "maemo"
-OBJS += maemo/hildon.o maemo/main.o
-maemo/%.o: maemo/%.c
-else
-OBJS += frontend/menu.o frontend/linux/in_evdev.o
-OBJS += frontend/common/input.o frontend/linux/xenv.o
+OBJS += frontend/common/readpng.o frontend/common/fonts.o
+OBJS += frontend/linux/plat.o
 
 ifeq "$(PLATFORM)" "generic"
-OBJS += frontend/plat_dummy.o
+OBJS += frontend/plat_sdl.o frontend/common/in_sdl.o
+USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "pandora"
 OBJS += frontend/linux/fbdev.o
-OBJS += frontend/plat_omap.o
+OBJS += frontend/plat_omap.o frontend/linux/xenv.o
 OBJS += frontend/plat_pandora.o
+USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "caanoo"
 OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
 OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
+USE_FRONTEND = 1
+endif
+ifeq "$(PLATFORM)" "maemo"
+OBJS += maemo/hildon.o maemo/main.o
+maemo/%.o: maemo/%.c
+OBJS += frontend/plugin_lib.o
+endif
+ifeq "$(PLATFORM)" "libretro"
+OBJS += frontend/libretro.o
+endif
+ifeq "$(USE_FRONTEND)" "1"
+OBJS += frontend/menu.o frontend/linux/in_evdev.o
+OBJS += frontend/common/input.o
+OBJS += frontend/plugin_lib.o
+ifeq "$(HAVE_TSLIB)" "1"
+frontend/%.o: CFLAGS += -DHAVE_TSLIB
+OBJS += frontend/pl_gun_ts.o
+endif
+else
+CFLAGS += -DNO_FRONTEND
 endif
-endif # !maemo
 
 ifdef X11
 frontend/%.o: CFLAGS += -DX11
@@ -140,12 +156,8 @@ endif
 ifdef PCNT
 CFLAGS += -DPCNT
 endif
-ifeq "$(HAVE_TSLIB)" "1"
-frontend/%.o: CFLAGS += -DHAVE_TSLIB
-OBJS += frontend/pl_gun_ts.o
-endif
 frontend/%.o: CFLAGS += -DIN_EVDEV
-frontend/menu.o: frontend/revision.h
+frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h
 
 libpcsxcore/gte_nf.o: libpcsxcore/gte.c
 	$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
@@ -159,33 +171,49 @@ frontend/revision.h: FORCE
 %.o: %.S
 	$(CC) $(CFLAGS) -c $^ -o $@
 
+target_: $(TARGET)
+
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
 
-clean: $(PLAT_CLEAN)
+clean: $(PLAT_CLEAN) clean_plugins
 	$(RM) $(TARGET) $(OBJS) $(TARGET).map
 
 ifneq ($(PLUGINS),)
+plugins_: $(PLUGINS)
+
 $(PLUGINS):
-	make -C plugins/gpulib/ clean
 	make -C $(dir $@)
 
 clean_plugins:
 	make -C plugins/gpulib/ clean
 	for dir in $(PLUGINS) ; do \
 		$(MAKE) -C $$(dirname $$dir) clean; done
+else
+plugins_:
+clean_plugins:
 endif
 
 # ----------- release -----------
 
 VER ?= $(shell git describe master)
 
+ifeq "$(PLATFORM)" "generic"
+OUT = pcsx_rearmed_$(VER)
+
+rel: pcsx $(PLUGINS) \
+		frontend/pandora/skin readme.txt COPYING
+	rm -rf $(OUT)
+	mkdir -p $(OUT)/plugins
+	mkdir -p $(OUT)/bios
+	cp -r $^ $(OUT)/
+	mv $(OUT)/*.so* $(OUT)/plugins/
+	zip -9 -r $(OUT).zip $(OUT)
+endif
+
 ifeq "$(PLATFORM)" "pandora"
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
-PLUGINS ?= plugins/spunull/spunull.so plugins/gpu-gles/gpu_gles.so \
-	plugins/gpu_unai/gpu_unai.so plugins/dfxvideo/gpu_peops.so
-
 rel: pcsx $(PLUGINS) \
 		frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
 		frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
@@ -207,9 +235,6 @@ PLAT_CLEAN = caanoo_clean
 caanoo_clean:
 	$(RM) frontend/320240/pollux_set
 
-PLUGINS ?= plugins/spunull/spunull.so plugins/gpu_unai/gpu_unai.so \
-	plugins/gpu-gles/gpu_gles.so
-
 rel: pcsx $(PLUGINS) \
 		frontend/320240/caanoo.gpe frontend/320240/pcsx26.png \
 		frontend/320240/pcsxb.png frontend/320240/skin \