cdriso: adjust getTD and getStatus to pcsxr-svn

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index c822bb1..f65e9ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,16 @@ 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/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
 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