updated to warm r2

[gpsp.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index c17af14..376970b 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -9,21 +9,31 @@ CC        = $(PREFIX)/bin/arm-open2x-linux-gcc
 STRIP     = $(PREFIX)/bin/arm-open2x-linux-strip
 
 OBJS      = main.o cpu.o memory.u video.o input.o sound.o gp2x.o gui.o        \
-            cheats.o zip.o cpu_threaded.z cpuctrl_mmsp2.o                     \
-            arm_stub.o video_blend.o flush_cache.o
-BIN       = gpsp.gpe 
+            cheats.o zip.o cpu_threaded.z arm_stub.o video_blend.o            \
+            warm.o upscale_aspect.o
+ifeq ($(WIZ),1)
+BIN       = gpsp_wiz
+else
+BIN       = gpsp_gp2x
+endif
 
 # Platform specific definitions 
 
 VPATH      += ..
 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                                                    \
 
 INCLUDES   = `$(PREFIX)/bin/sdl-config --cflags` -I$(PREFIX)/include
 LIBS       = `$(PREFIX)/bin/sdl-config --libs`               \
-              -lm -ldl -lpthread -lz -static
+              -lm -ldl -lpthread -lz
+ifneq ($(WIZ),1)
+LIBS       += -static
+endif
 
 # Compilation:
 
@@ -41,8 +51,11 @@ LIBS       = `$(PREFIX)/bin/sdl-config --libs`               \
 %.o: %.S
        $(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
 
+%.o: %.s
+       $(CC) $(ASFLAGS) $(INCLUDES) -c -o $@ $<
+
 all:   $(OBJS)
-       $(CC) $(OBJS) $(LIBS) -o $(BIN)  
+       $(CC) $(OBJS) $(LIBS) -o $(BIN)
        $(STRIP) $(BIN)
 
 clean: