X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=gp2x%2FMakefile;h=9d281c11acbca466ae2562f219a7a830b41b7abb;hb=4b1350926e1b426ff2f83f08c579e1a819e9358c;hp=376970bc86b3bd1877e438ad8fcc35c906561acd;hpb=c872443f88bd037784f795767041db9e307ac3f0;p=gpsp.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 376970b..9d281c1 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -4,7 +4,7 @@
 
 # Global definitions
 
-PREFIX  = /opt/open2x/gcc-4.1.1-glibc-2.3.6
+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
 
@@ -12,21 +12,24 @@ 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)
+OBJS      += pollux_dpc_set.o
 BIN       = gpsp_wiz
 else
 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                                                    \
+              -fno-builtin -Wall                                              \
 
 INCLUDES   = `$(PREFIX)/bin/sdl-config --cflags` -I$(PREFIX)/include
 LIBS       = `$(PREFIX)/bin/sdl-config --libs`               \
@@ -39,6 +42,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 $@ $<
 
@@ -54,7 +61,7 @@ endif
 %.o: %.s
 	$(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
 
-all:	$(OBJS)
+$(BIN):	$(OBJS)
 	$(CC) $(OBJS) $(LIBS) -o $(BIN)
 	$(STRIP) $(BIN)