notaz.gp2x.de
/
gpsp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable -Wall and fix warnings reported by it
[gpsp.git]
/
gp2x
/
Makefile
diff --git
a/gp2x/Makefile
b/gp2x/Makefile
index
be06a86
..
9d281c1
100644
(file)
--- a/
gp2x/Makefile
+++ b/
gp2x/Makefile
@@
-4,47
+4,48
@@
# Global definitions
# 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
+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 = $(PREFIX)/bin/arm-open2x-linux-gcc
STRIP = $(PREFIX)/bin/arm-open2x-linux-strip
-endif
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 \
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)
+OBJS += pollux_dpc_set.o
+BIN = gpsp_wiz
+else
+BIN = gpsp_gp2x
+endif
+
+-include Makefile.local
# Platform specific definitions
# 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 \
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` \
-lm -ldl -lpthread -lz
ifneq ($(WIZ),1)
INCLUDES = `$(PREFIX)/bin/sdl-config --cflags` -I$(PREFIX)/include
LIBS = `$(PREFIX)/bin/sdl-config --libs` \
-lm -ldl -lpthread -lz
ifneq ($(WIZ),1)
-OBJS += cpuctrl_mmsp2.o
LIBS += -static
endif
LIBS += -static
endif
-CFLAGS += -ggdb
-LIBS += -ggdb
-
# Compilation:
.SUFFIXES: .c
# Compilation:
.SUFFIXES: .c
+all: $(BIN)
+
+cpu.o cpu_threaded.z: CFLAGS += -Wno-unused-variable -Wno-unused-label
+
%.z: %.c
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
%.z: %.c
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
@@
-57,9
+58,12
@@
LIBS += -ggdb
%.o: %.S
$(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
%.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)
+ $(STRIP) $(BIN)
clean:
rm -f *.o *.u *.z $(BIN)
clean:
rm -f *.o *.u *.z $(BIN)