X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=af110879e822c55b982ff20993df71e9997ac63d;hp=b544250618a5ab741025e4c20957897bbe655313;hb=cd5abe38be33f4ac20627cbeac5246b9bee22715;hpb=4ea086f6049c3f2c286f1a4e1e23b5763629067a

diff --git a/Makefile b/Makefile
index b5442506..af110879 100644
--- 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
@@ -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)