X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=7288ef1b3dc89c09083153542aa0aeaef9c9a0db;hp=5a7b278ef64b0478f3960a7d15a8010acab097bd;hb=fb4c6fba4c83b2f00a78c331fd56e5d995ce02ab;hpb=a80ae4a0353fce94df700ec84222d3c56c3d813a

diff --git a/Makefile b/Makefile
index 5a7b278e..7288ef1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 #CROSS_COMPILE=
-AS = $(CROSS_COMPILE)as
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
+AS  = $(CROSS_COMPILE)as
+GCC = $(CROSS_COMPILE)gcc
+CC  = $(CROSS_COMPILE)gcc
+LD  = $(CROSS_COMPILE)ld
+ifdef CC_OVERRIDE
+CC = $(CC_OVERRIDE)
+endif
 
 ARM926 ?= 0
 ARM_CORTEXA8 ?= 1
+PLATFORM ?= pandora
 USE_OSS ?= 1
 #USE_ALSA = 1
 #DRC_DBG = 1
@@ -13,10 +18,10 @@ TARGET = pcsx
 
 -include Makefile.local
 
-ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
+ARCH = $(shell $(GCC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
 
 CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
-LDFLAGS += -lz -lpthread -ldl -lpng -lbz2
+LDFLAGS += -lpthread -ldl -lpng -lz -lm
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
@@ -24,28 +29,33 @@ CFLAGS += $(EXTRA_CFLAGS)
 
 ifeq "$(ARCH)" "arm"
 ifeq "$(ARM_CORTEXA8)" "1"
-CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+GCC_CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 endif
 ifeq "$(ARM926)" "1"
-CFLAGS += -mcpu=arm926ej-s -mtune=arm926ej-s
-ASFLAGS += -mcpu=arm926ej-s
+GCC_CFLAGS += -mcpu=arm926ej-s -mtune=arm926ej-s
+ASFLAGS += -mcpu=arm926ej-s -mfloat-abi=softfp
 endif
 endif
+CFLAGS += $(GCC_CFLAGS)
 
 # detect armv7 and NEON from the specified CPU
-HAVE_NEON = $(shell $(CC) -E -dD $(CFLAGS) frontend/config.h | grep -q '__ARM_NEON__ 1' && echo 1)
-HAVE_ARMV7 = $(shell $(CC) -E -dD $(CFLAGS) frontend/config.h | grep -q '__ARM_ARCH_7A__ 1' && echo 1)
+HAVE_NEON = $(shell $(GCC) -E -dD $(GCC_CFLAGS) frontend/config.h | grep -q '__ARM_NEON__ 1' && echo 1)
+HAVE_ARMV7 = $(shell $(GCC) -E -dD $(GCC_CFLAGS) frontend/config.h | grep -q '__ARM_ARCH_7A__ 1' && echo 1)
 
 all: $(TARGET)
 
 # core
 OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
-	libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/gte.o libpcsxcore/mdec.o \
+	libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/mdec.o \
 	libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \
 	libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \
 	libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \
 	libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o
+OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
+ifeq "$(ARCH)" "arm"
+OBJS += libpcsxcore/gte_arm.o
+endif
 ifeq "$(HAVE_NEON)" "1"
 OBJS += libpcsxcore/gte_neon.o
 endif
@@ -54,7 +64,6 @@ libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 
 # dynarec
 ifndef NO_NEW_DRC
-libpcsxcore/new_dynarec/linkage_arm.o: ASFLAGS += --defsym HAVE_ARMV7=$(HAVE_ARMV7)
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 endif
@@ -72,7 +81,7 @@ OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
 	plugins/dfsound/registers.o plugins/dfsound/spu.o
 plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
 	plugins/dfsound/xa.c
-ifeq "$(HAVE_NEON)" "1"
+ifeq "$(ARCH)" "arm"
 OBJS += plugins/dfsound/arm_utils.o
 endif
 ifeq "$(USE_OSS)" "1"
@@ -112,16 +121,23 @@ ifeq "$(USE_GTK)" "1"
 OBJS += maemo/hildon.o maemo/main.o
 maemo/%.o: maemo/%.c
 else
-frontend/%.o: CFLAGS += -DVOUT_FBDEV
-OBJS += frontend/menu.o
-OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
+OBJS += frontend/menu.o frontend/linux/in_evdev.o
 OBJS += frontend/common/input.o frontend/linux/oshide.o
-ifeq "$(ARCH)" "arm"
+
+ifeq "$(PLATFORM)" "pandora"
+frontend/%.o: CFLAGS += -DVOUT_FBDEV
+OBJS += frontend/linux/fbdev.o
 OBJS += frontend/plat_omap.o
-OBJS += frontend/pandora.o
+OBJS += frontend/plat_pandora.o
+else
+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
 else
 OBJS += frontend/plat_dummy.o
 endif
+endif
+
 endif # !USE_GTK
 
 ifeq "$(HAVE_NEON)" "1"
@@ -140,9 +156,13 @@ ifndef NO_TSLIB
 frontend/%.o: CFLAGS += -DHAVE_TSLIB
 OBJS += frontend/pl_gun_ts.o
 endif
+%.o: ASFLAGS += --defsym HAVE_ARMV7=$(HAVE_ARMV7)
 frontend/%.o: CFLAGS += -DIN_EVDEV
 frontend/menu.o: frontend/revision.h
 
+libpcsxcore/gte_nf.o: libpcsxcore/gte.c
+	$(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
+
 frontend/revision.h: FORCE
 	@(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
 	@diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
@@ -173,8 +193,8 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 VER ?= $(shell git describe master)
 
 rel: pcsx $(PLUGINS) \
-		pandora/pcsx.sh pandora/pcsx.pxml.templ pandora/pcsx.png \
-		pandora/picorestore pandora/readme.txt pandora/skin COPYING
+		frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
+		frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
 	rm -rf out
 	mkdir -p out/plugins
 	cp -r $^ out/
@@ -182,4 +202,4 @@ rel: pcsx $(PLUGINS) \
 	rm out/pcsx.pxml.templ
 	mv out/*.so out/plugins/
 	mv out/plugins/gpu_neon.so out/plugins/gpuPEOPS2.so
-	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c
+	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c