allow some build customization

also correct a statement in readme.

diff --git a/Makefile b/Makefile
index c822bb1..644639b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,14 @@ endif
 ifndef DEBUG
 CFLAGS += -O2 # -DNDEBUG
 endif
 ifndef DEBUG
 CFLAGS += -O2 # -DNDEBUG
 endif

+USE_OSS = 1
+#USE_ALSA = 1

 #DRC_DBG = 1
 #PCNT = 1
 TARGET = pcsx
 
 #DRC_DBG = 1
 #PCNT = 1
 TARGET = pcsx
 

+-include Makefile.local
+

 all: $(TARGET)
 
 # core
 all: $(TARGET)
 
 # core


@@ -40,9 +44,18 @@ CFLAGS += -DDRC_DBG
 endif
 
 # spu
 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
 # gpu
 plugins/dfxvideo/%.o: CFLAGS += -Wall
 OBJS += plugins/dfxvideo/gpu.o

diff --git a/frontend/config.h b/frontend/config.h
index 768460f..15ffd30 100644 (file)
--- a/frontend/config.h
+++ b/frontend/config.h
@@ -5,4 +5,3 @@
 #define PACKAGE_VERSION "1.9"
 #define DEF_PLUGIN_DIR "."
 //#define EMU_LOG printf
 #define PACKAGE_VERSION "1.9"
 #define DEF_PLUGIN_DIR "."
 //#define EMU_LOG printf

-#define USEOSS

diff --git a/pandora/readme.txt b/pandora/readme.txt
index 9504226..573a246 100644 (file)
--- a/pandora/readme.txt
+++ b/pandora/readme.txt
@@ -11,8 +11,7 @@ version is ARM architecture oriented and features MIPS->ARM recompiler by
 Ari64. It was created for Pandora handheld, but should be usable on other
 devices after some code adjustments.
 
 Ari64. It was created for Pandora handheld, but should be usable on other
 devices after some code adjustments.
 

-It does not, however, have anything in common with similar psx4all and
-pcsx4all projects, except that all of these are PCSX ports.
+PCSX ReARMed features GPU and SPU plugins from PCSX4ALL project.

 
 
 Usage
 
 
 Usage

diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile
index 1110151..4b61b6f 100644 (file)
--- a/plugins/gpu-gles/Makefile
+++ b/plugins/gpu-gles/Makefile
@@ -24,6 +24,8 @@ LIB = -L$(PREFIX)lib -lGLES_CM -lX11 -lXau -lXdmcp
 \r
 OBJ = gpuDraw.o gpuFps.o gpuPlugin.o gpuPrim.o gpuTexture.o\r
 \r
 \r
 OBJ = gpuDraw.o gpuFps.o gpuPlugin.o gpuPrim.o gpuTexture.o\r
 \r

+-include Makefile.local\r
+\r

 all: $(TARGET)\r
 \r
 $(TARGET): $(OBJ)\r
 all: $(TARGET)\r
 \r
 $(TARGET): $(OBJ)\r

diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile
index 636c31b..a89ca6b 100644 (file)
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai/Makefile
@@ -11,6 +11,8 @@ CFLAGS += -fno-schedule-insns -fno-schedule-insns2
 TARGET = gpuPCSX4ALL.so
 LDFLAGS += -shared -Wl,-soname,$(TARGET)
 
 TARGET = gpuPCSX4ALL.so
 LDFLAGS += -shared -Wl,-soname,$(TARGET)
 

+-include Makefile.local
+

 all: $(TARGET)
 
 $(TARGET): gpu.cpp ../../frontend/arm_utils.s
 all: $(TARGET)
 
 $(TARGET): gpu.cpp ../../frontend/arm_utils.s

diff --git a/plugins/spunull/Makefile b/plugins/spunull/Makefile
index 7371522..f9b76ed 100644 (file)
--- a/plugins/spunull/Makefile
+++ b/plugins/spunull/Makefile
@@ -2,6 +2,8 @@ CC = $(CROSS_COMPILE)gcc
 
 all: spunull.so
 
 
 all: spunull.so
 

+-include Makefile.local
+

 spunull.so: spunull.c
        $(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
 
 spunull.so: spunull.c
        $(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^