X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=9f06dd84db1b6a79b845938e68d46f20be0f703b;hb=108c704a364e89d071c67f929a292f05d019236a;hp=be06a867badd79b64f8966490145460570213b6e;hpb=4742480dcabcbd9d23fd8cb9a655fc8c9c314513;p=gpsp.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index be06a86..9f06dd8 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -4,47 +4,57 @@
 
 # Global definitions
 
-ifeq ($(WIZ),1)
-PREFIX  = /opt/arm-openwiz-linux-gnu
-CC        = $(PREFIX)/bin/arm-openwiz-linux-gnu-gcc
-STRIP     = $(PREFIX)/bin/arm-openwiz-linux-gnu-strip
-else
-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
-endif
+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            \
-            flush_cache.o warm.o sys_cacheflush.o
-BIN       = gpsp.gpe 
+            warm.o upscale_aspect.o
+ifeq ($(WIZ),1)
+POLLUX    = 1
+OBJS      += pollux_dpc_set.o
+BIN       = gpsp_wiz
+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      += ..
+VPATH      += .. ../arm
 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)
-OBJS       += cpuctrl_mmsp2.o
+ifeq ($(WIZ)$(CAANOO),)
 LIBS       += -static
 endif
 
-CFLAGS     += -ggdb
-LIBS       += -ggdb
-
 # Compilation:
 
 .SUFFIXES: .c
 
+all:    $(BIN)
+
+cpu.o cpu_threaded.z: CFLAGS += -Wno-unused-variable -Wno-unused-label
+
 %.z: %.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
@@ -57,9 +67,11 @@ LIBS       += -ggdb
 %.o: %.S
 	$(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
 
-all:	$(OBJS)
-	$(CC) $(OBJS) $(LIBS) -o $(BIN)  
-#	$(STRIP) $(BIN)
+%.o: %.s
+	$(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
+
+$(BIN):	$(OBJS)
+	$(CC) $(OBJS) $(LIBS) -o $(BIN)
 
 clean:
 	rm -f *.o *.u *.z $(BIN)