X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=5e8a906c616f1ddd119f4fd5568ee30e1ba80680;hb=HEAD;hp=20964197516e9194c9aa460ba6bb6805c027a10b;hpb=d5e0983c10e0ca717603dd1a406ff0d6e450e905;p=gpsp.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 2096419..5e8a906 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -4,20 +4,27 @@
 
 # Global definitions
 
-PREFIX  = /opt/open2x/gcc-4.1.1-glibc-2.3.6
-CC        = $(PREFIX)/bin/arm-open2x-linux-gcc
-STRIP     = $(PREFIX)/bin/arm-open2x-linux-strip
+CC        = $(CROSS_COMPILE)gcc
 
 OBJS      = main.o cpu.o memory.u video.o input.o sound.o gp2x.o gui.o        \
             cheats.o zip.o cpu_threaded.z arm_stub.o video_blend.o            \
             warm.o upscale_aspect.o
 ifeq ($(WIZ),1)
+POLLUX    = 1
 OBJS      += pollux_dpc_set.o
 BIN       = gpsp_wiz
-else
+endif
+ifeq ($(CAANOO),1)
+POLLUX    = 1
+OBJS      += pollux_dpc_set.o
+BIN       = gpsp_caanoo
+endif
+ifeq ($(BIN),)
 BIN       = gpsp_gp2x
 endif
 
+-include Makefile.local
+
 # Platform specific definitions 
 
 VPATH      += .. ../arm
@@ -25,14 +32,18 @@ CFLAGS     += -DARM_ARCH -DGP2X_BUILD
 ifeq ($(WIZ),1)
 CFLAGS     += -DWIZ_BUILD
 endif
-# NOTE: -funroll-loops will slow down compiling considerably
-CFLAGS     += -O3 -std=c99 -msoft-float -funsigned-char -fno-common           \
-              -fno-builtin                                                    \
+ifeq ($(POLLUX),1)
+CFLAGS     += -DPOLLUX_BUILD
+endif
+CFLAGS     += -std=c99 -msoft-float -funsigned-char -Wall -ggdb
+ifndef DEBUG
+CFLAGS     += -O2
+endif
 
-INCLUDES   = `$(PREFIX)/bin/sdl-config --cflags` -I$(PREFIX)/include
-LIBS       = `$(PREFIX)/bin/sdl-config --libs`               \
+INCLUDES   = `sdl-config --cflags`
+LIBS       = `sdl-config --libs` \
               -lm -ldl -lpthread -lz
-ifneq ($(WIZ),1)
+ifeq ($(WIZ)$(CAANOO),)
 LIBS       += -static
 endif
 
@@ -40,6 +51,10 @@ endif
 
 .SUFFIXES: .c
 
+all:    $(BIN)
+
+cpu.o cpu_threaded.z: CFLAGS += -Wno-unused-variable -Wno-unused-label
+
 %.z: %.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
@@ -55,10 +70,18 @@ endif
 %.o: %.s
 	$(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
 
-all:	$(OBJS)
+$(BIN):	$(OBJS)
 	$(CC) $(OBJS) $(LIBS) -o $(BIN)
-	$(STRIP) $(BIN)
 
 clean:
 	rm -f *.o *.u *.z $(BIN) 
 
+rel: gpsp_caanoo gpsp_caanoo.ini gpsp_caanoo.gpe warm_2.6.24.ko \
+		../COPYING.DOC ../readme.txt readme_gp2x.txt ../game_config.txt
+	rm -rf out
+	mkdir -p out/gpsp_caanoo
+	cp $^ out/gpsp_caanoo/
+	mv out/gpsp_caanoo/gpsp_caanoo.ini out/
+	mv out/gpsp_caanoo/readme_gp2x.txt out/gpsp_caanoo/readme_caanoo.txt
+	echo -n '/mnt/sd' > out/gpsp_caanoo/romdir.txt
+	cd out && zip -9 -r ../gpsp_caanoo.zip *