update release packaging

use gpu_neon emu code for everything

diff --git a/Makefile b/Makefile
index 4ca807a..8d49f10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,13 +174,13 @@ frontend/revision.h: FORCE
 $(TARGET): $(OBJS)
        $(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
 
-PLUGINS ?= plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
-       plugins/gpu-gles/gpuGLES.so plugins/gpu_neon/gpu_neon.so
+PLUGINS ?= plugins/spunull/spunull.so plugins/gpu-gles/gpuGLES.so \
+       plugins/gpu_neon/gpu_unai.so plugins/gpu_neon/gpu_peops.so
 
 $(PLUGINS):
        make -C $(dir $@)
 
-clean:
+clean: $(PLAT_CLEAN)
        $(RM) $(TARGET) $(OBJS) $(TARGET).map
 
 clean_plugins:
@@ -202,5 +202,6 @@ rel: pcsx $(PLUGINS) \
        sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
        rm out/pcsx.pxml.templ
        mv out/*.so out/plugins/
-       mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so
+       mv out/plugins/gpu_unai.so out/plugins/gpuPCSX4ALL.so
+       mv out/plugins/gpu_peops.so out/plugins/gpuPEOPS.so
        $(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c

diff --git a/Makefile.caanoo b/Makefile.caanoo
index 002f2c3..5db03f3 100644 (file)
--- a/Makefile.caanoo
+++ b/Makefile.caanoo
@@ -3,9 +3,14 @@ export ARM_CORTEXA8=0
 # caanoo also covers Wiz
 PLATFORM=caanoo
 
+PLAT_CLEAN = caanoo_clean
+
 include Makefile
 
-PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so
+caanoo_clean:
+       $(RM) frontend/320240/pollux_set
+
+PLUGINS = plugins/spunull/spunull.so plugins/gpu_neon/gpu_unai.so
 
 # ----------- release -----------
 
@@ -13,10 +18,12 @@ rel_caanoo: pcsx $(PLUGINS) \
                frontend/320240/caanoo.gpe frontend/320240/pcsx26.png \
                frontend/320240/pcsxb.png frontend/320240/skin \
                frontend/warm/bin/warm_2.6.24.ko frontend/320240/pollux_set \
-               frontend/320240/pcsx_rearmed.ini readme.txt COPYING
+               frontend/320240/pcsx_rearmed.ini frontend/320240/haptic.txt \
+               readme.txt COPYING
        rm -rf out
        mkdir -p out/pcsx_rearmed/plugins
        cp -r $^ out/pcsx_rearmed/
+       mv out/pcsx_rearmed/gpu_unai.so out/pcsx_rearmed/gpuPCSX4ALL.so
        mv out/pcsx_rearmed/*.so out/pcsx_rearmed/plugins/
        mv out/pcsx_rearmed/caanoo.gpe out/pcsx_rearmed/pcsx.gpe
        mv out/pcsx_rearmed/pcsx_rearmed.ini out/

diff --git a/frontend/320240/haptic.txt b/frontend/320240/haptic.txt
new file mode 100644 (file)
index 0000000..624056d
--- /dev/null
+++ b/frontend/320240/haptic.txt
@@ -0,0 +1,3 @@
+0      126
+100    -126
+115    0

diff --git a/frontend/main.c b/frontend/main.c
index c902142..fd4674b 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -360,9 +360,9 @@ int main(int argc, char *argv[])
        in_init();
        in_evdev_init();
        //in_probe();
+       pl_init();
        plat_init();
        menu_init(); // loads config
-       pl_init();
 
        if (psxout)
                Config.PsxOut = 1;