diff options
| author | notaz | 2011-01-07 23:58:45 +0200 |
|---|---|---|
| committer | notaz | 2011-01-07 23:58:45 +0200 |
| commit | de38f20e0863e33a2a824380da5aa46b1dc39631 (patch) | |
| tree | 95b9dd35b69e3bc21ce62d7f785304833f038424 | |
| parent | 131f0d940d328ff884503b9979f9936a36c7f0b7 (diff) | |
| download | pcsx_rearmed-de38f20e0863e33a2a824380da5aa46b1dc39631.tar.gz pcsx_rearmed-de38f20e0863e33a2a824380da5aa46b1dc39631.tar.bz2 pcsx_rearmed-de38f20e0863e33a2a824380da5aa46b1dc39631.zip | |
allow some build customization
also correct a statement in readme.
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | frontend/config.h | 1 | ||||
| -rw-r--r-- | pandora/readme.txt | 3 | ||||
| -rw-r--r-- | plugins/gpu-gles/Makefile | 2 | ||||
| -rw-r--r-- | plugins/gpu_unai/Makefile | 2 | ||||
| -rw-r--r-- | plugins/spunull/Makefile | 2 |
6 files changed, 23 insertions, 6 deletions
@@ -14,10 +14,14 @@ endif ifndef DEBUG 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 diff --git a/frontend/config.h b/frontend/config.h index 768460f..15ffd30 100644 --- 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 USEOSS diff --git a/pandora/readme.txt b/pandora/readme.txt index 9504226..573a246 100644 --- 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. -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 diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile index 1110151..4b61b6f 100644 --- a/plugins/gpu-gles/Makefile +++ b/plugins/gpu-gles/Makefile @@ -24,6 +24,8 @@ LIB = -L$(PREFIX)lib -lGLES_CM -lX11 -lXau -lXdmcp OBJ = gpuDraw.o gpuFps.o gpuPlugin.o gpuPrim.o gpuTexture.o
+-include Makefile.local
+
all: $(TARGET)
$(TARGET): $(OBJ)
diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile index 636c31b..a89ca6b 100644 --- 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) +-include Makefile.local + all: $(TARGET) $(TARGET): gpu.cpp ../../frontend/arm_utils.s diff --git a/plugins/spunull/Makefile b/plugins/spunull/Makefile index 7371522..f9b76ed 100644 --- a/plugins/spunull/Makefile +++ b/plugins/spunull/Makefile @@ -2,6 +2,8 @@ CC = $(CROSS_COMPILE)gcc all: spunull.so +-include Makefile.local + spunull.so: spunull.c $(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^ |