X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=f65e9aeed8c2f22c0339d6b67934a860dad2d2fa;hp=f195b9b65da86cf75a9387ae3fabd85846996db8;hb=076655d17df35d1f40137e88b7beaf5a039b058c;hpb=303ee308587f4d2d24047ed5c43de999777cd275

diff --git a/Makefile b/Makefile
index f195b9b6..f65e9aee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,25 @@ AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 
+ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
+
 CFLAGS += -ggdb -Ifrontend
 LDFLAGS += -lz -lpthread -ldl -lpng
-ifdef CROSS_COMPILE
+ifeq "$(ARCH)" "arm"
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
 ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 endif
 ifndef DEBUG
-CFLAGS += -O2 # -DNDEBUG
+CFLAGS += -O2 -DNDEBUG
 endif
+USE_OSS = 1
+#USE_ALSA = 1
 #DRC_DBG = 1
 #PCNT = 1
 TARGET = pcsx
 
+-include Makefile.local
+
 all: $(TARGET)
 
 # core
@@ -38,17 +44,25 @@ CFLAGS += -DDRC_DBG
 endif
 
 # spu
-OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/oss.o plugins/dfsound/reverb.o \
-	plugins/dfsound/xa.o plugins/dfsound/freeze.o plugins/dfsound/cfg.o plugins/dfsound/registers.o \
-	plugins/dfsound/spu.o
+OBJS += plugins/dfsound/adsr.o plugins/dfsound/dma.o plugins/dfsound/reverb.o plugins/dfsound/xa.o \
+	plugins/dfsound/freeze.o plugins/dfsound/cfg.o plugins/dfsound/registers.o plugins/dfsound/spu.o
+ifeq "$(USE_OSS)" "1"
+plugins/dfsound/%.o: CFLAGS += -DUSEOSS
+OBJS += plugins/dfsound/oss.o
+endif
+ifeq "$(USE_ALSA)" "1"
+plugins/dfsound/%.o: CFLAGS += -DUSEALSA
+OBJS += plugins/dfsound/alsa.o
+LDFLAGS += -lasound
+endif
+
 # gpu
-OBJS += plugins/dfxvideo/cfg.o plugins/dfxvideo/fps.o plugins/dfxvideo/key.o plugins/dfxvideo/prim.o \
-	plugins/dfxvideo/gpu.o plugins/dfxvideo/menu.o plugins/dfxvideo/soft.o plugins/dfxvideo/zn.o
+plugins/dfxvideo/%.o: CFLAGS += -Wall
+OBJS += plugins/dfxvideo/gpu.o
 ifdef X11
 LDFLAGS += -lX11 -lXv
 OBJS += plugins/dfxvideo/draw.o
 else
-plugins/dfxvideo/%.o: CFLAGS += -D_MACGL # disables X in dfxvideo
 OBJS += plugins/dfxvideo/draw_fb.o
 endif
 # cdrcimg
@@ -56,19 +70,21 @@ plugins/cdrcimg/%.o: CFLAGS += -Wall
 OBJS += plugins/cdrcimg/cdrcimg.o
 
 # gui
-OBJS += gui/Plugin.o
-
 OBJS += frontend/main.o frontend/plugin.o frontend/plugin_lib.o
 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
-ifdef CROSS_COMPILE
+ifeq "$(ARCH)" "arm"
 OBJS += frontend/arm_utils.o
 OBJS += frontend/plat_omap.o
 else
 OBJS += frontend/plat_dummy.o
 endif
+ifdef X11
+frontend/%.o: CFLAGS += -DX11
+OBJS += frontend/xkb.o
+endif
 ifdef PCNT
 CFLAGS += -DPCNT
 endif
@@ -85,11 +101,18 @@ frontend/revision.h: FORCE
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
 
-spunull.so: plugins/spunull/spunull.c
-	$(CC) $(CFLAGS) -shared -fPIC -o $@ $^
+PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
+	plugins/gpu-gles/gpuGLES.so
+
+$(PLUGINS):
+	make -C $(dir $@)
 
 clean:
-	$(RM) $(TARGET) $(OBJS)
+	$(RM) $(TARGET) $(OBJS) $(TARGET).map
+
+clean_plugins:
+	for dir in $(PLUGINS) ; do \
+		$(MAKE) -C $$(dirname $$dir) clean; done
 
 # ----------- release -----------
 
@@ -97,9 +120,11 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 VER ?= $(shell git describe --abbrev=0 master)
 
-rel: pcsx pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
+rel: pcsx $(PLUGINS) \
+		pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
 		pandora/picorestore pandora/readme.txt skin COPYING
 	rm -rf out
-	mkdir out
+	mkdir -p out/plugins
 	cp -r $^ out/
+	mv out/*.so out/plugins/
 	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x pandora/pcsx.pxml -i pandora/pcsx.png -c