X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=de10e4c1a932e7ffb83c5eb8878534ab87bba70a;hp=c822bb12fd0dd6a981d9def108308cd884072b0b;hb=33716956638b56f994b9aadbd70c9c2265acf048;hpb=ee78346e30720ddb3f4c97b6598bdc6dc7257f98

diff --git a/Makefile b/Makefile
index c822bb12..de10e4c1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,18 +6,22 @@ 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
+LDFLAGS += -lz -lpthread -ldl -lpng -lbz2
 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
@@ -40,9 +44,18 @@ 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/dma.o plugins/dfsound/freeze.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
 plugins/dfxvideo/%.o: CFLAGS += -Wall
 OBJS += plugins/dfxvideo/gpu.o
@@ -68,6 +81,10 @@ 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