aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--frontend/menu.c4
-rw-r--r--pandora/readme.txt43
-rw-r--r--plugins/spunull/Makefile9
4 files changed, 55 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 28a0c79..c822bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -84,14 +84,18 @@ frontend/revision.h: FORCE
$(TARGET): $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
-spunull.so: plugins/spunull/spunull.c
- $(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
+PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
+ plugins/gpu-gles/gpuGLES.so
-plugins/gpu-gles/gpuGLES.so:
- make -C plugins/gpu-gles/
+$(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 -----------
@@ -99,7 +103,7 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
VER ?= $(shell git describe --abbrev=0 master)
-rel: pcsx spunull.so plugins/gpu-gles/gpuGLES.so \
+rel: pcsx $(PLUGINS) \
pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
pandora/picorestore pandora/readme.txt skin COPYING
rm -rf out
diff --git a/frontend/menu.c b/frontend/menu.c
index 9036d5f..34b6e36 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -965,7 +965,9 @@ const char *plat_get_credits(void)
"(C) 2009-2010 PCSX-Reloaded Team\n\n"
"GPU and SPU code by Pete Bernert\n"
" and the P.E.Op.S. team\n"
- "ARM recompiler (C) 2009-2010 Ari64\n\n"
+ "ARM recompiler (C) 2009-2010 Ari64\n"
+ "PCSX4ALL plugins by PCSX4ALL team\n"
+ " Chui, Franxis, Unai\n\n"
"integration, optimization and\n"
" frontend (C) 2010-2011 notaz\n";
}
diff --git a/pandora/readme.txt b/pandora/readme.txt
index 9a87e26..9504226 100644
--- a/pandora/readme.txt
+++ b/pandora/readme.txt
@@ -31,14 +31,36 @@ Supportd CD image formats:
CDDA (CD audio) support requires .cue/.bin format.
+Plugins
+-------
+
+GPU (graphics) and SPU (sound) plugins can be selected in
+[BIOS/Plugins] menu:
+
+builtin_gpu - the P.E.Op.S. GPU plugin, most accurate but slow.
+gpuPCSX4ALL.so - plugin from PCSX4ALL project. Faster but has some glitches.
+gpuGLES.so - experimental port of P.E.Op.S. MesaGL plugin to OpenGL ES.
+ Occasionally faster but has lots of glitches and seems to
+ be rather unstable (may crash the system).
+builtin_spu - P.E.Op.S. SPU plugin, most accurate but slow.
+spunull.so - NULL plugin, i.e. no sound emulation.
+
+
Changelog
---------
-r2:
+r3 (2011-01-05):
++ added Pickle's port of gpu-gles from psx4m project
++ added PCSX4ALL gpu as a plugin
+* improved gpu plugin support
++ added savestate preview
+* various frontend fixes
+
+r2 (2010-12-29):
* fixed memcard paths
* fixed a keybind copy-paste bug
* properly implemented pad handling
- (inputs no longer controls both emulated pads at once)
+ (inputs no longer control both emulated pads at once)
* fixed a crash caused by framebuffer out of range access
* fixed SWL/SWR handling (usually resulted in graphic glitches)
* fixed BxxZAL (Medal of Honor)
@@ -48,7 +70,7 @@ r2:
+ added per-game configs (controls still not saved though)
+ added simple plugin select interface to the menu
-r1:
+r1 (2010-12-25):
* initial release
@@ -74,20 +96,21 @@ Emulator core:
Stefan Sikora <hoshy@schrauberstube.de>
(C) 2009-2010 PCSX-Reloaded Team
- avlex (Help on xcode project)
- Dario (Various bugfixes)
edgbla (Root counters, various core/plugin fixes)
Firnis (GTE code from PCSX-Revolution Project)
Gabriele Gorla (MDEC decoder)
- maggix (Snow Leopard compile fix)
- NeToU (Bugfix)
Peter Collingbourne (Various core/psxbios fixes)
- siveritas (Bugfix)
+ Dario, NeToU, siveritas (Various bugfixes)
shalma (GTE Divider, various core fixes)
- Tristin Celestin (PulseAudio support)
Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff)
-GLES plugin:
+PCSX4ALL GPU plugin:
+ (C) 2010 PCSX4ALL Team
+ (C) 2010 Unai
+ Franxis <franxism@gmail.com>
+ Chui <sdl_gp32@yahoo.es>
+
+GLES plugin (psx4m project):
(C) 1999-2009 by Pete Bernert
EQ
Olli Hinkka
diff --git a/plugins/spunull/Makefile b/plugins/spunull/Makefile
new file mode 100644
index 0000000..7371522
--- /dev/null
+++ b/plugins/spunull/Makefile
@@ -0,0 +1,9 @@
+CC = $(CROSS_COMPILE)gcc
+
+all: spunull.so
+
+spunull.so: spunull.c
+ $(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
+
+clean:
+ $(RM) spunull.so