updated to warm r2

[gpsp.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index be06a86..376970b 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -4,20 +4,18 @@
 
 # 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
 
 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)
+BIN       = gpsp_wiz
+else
+BIN       = gpsp_gp2x
+endif
 
 # Platform specific definitions 
 
@@ -34,13 +32,9 @@ 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
 
-CFLAGS     += -ggdb
-LIBS       += -ggdb
-
 # Compilation:
 
 .SUFFIXES: .c
@@ -57,9 +51,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)
+       $(CC) $(OBJS) $(LIBS) -o $(BIN)
+       $(STRIP) $(BIN)
 
 clean:
        rm -f *.o *.u *.z $(BIN)