psx_gpu: 2x sprite fixes and integration

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 8b7d83c..af11087 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # default stuff goes here, so that config can override
 TARGET = pcsx
 CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
-LDLIBS += -lpthread -lm
+LDLIBS += -lpthread
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
@@ -117,7 +117,7 @@ OBJS += plugins/gpu_unai/gpulib_if.o
 ifeq "$(ARCH)" "arm"
 OBJS += plugins/gpu_unai/gpu_arm.o
 endif
-plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED
+plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3
 CC_LINK = $(CXX)
 endif
 
@@ -145,6 +145,7 @@ endif
 ifeq "$(PLATFORM)" "caanoo"
 OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
 OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
+libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS
 USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "maemo"
@@ -214,7 +215,7 @@ endif
 
 # ----------- release -----------
 
-VER ?= $(shell git describe master)
+VER ?= $(shell git describe HEAD)
 
 ifeq "$(PLATFORM)" "generic"
 OUT = pcsx_rearmed_$(VER)
@@ -241,9 +242,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_unai.so out/plugins/gpuPCSX4ALL.so
-       mv out/plugins/gpu_gles.so out/plugins/gpuGLES.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
 endif
 
@@ -263,8 +261,6 @@ rel: pcsx $(PLUGINS) \
        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/gpu_gles.so out/pcsx_rearmed/gpuGLES.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/