cpu clock setup, save rom dir, cleanups

[gpsp.git] / gp2x / Makefile

diff --git a/gp2x/Makefile b/gp2x/Makefile
index be06a86..7258644 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -16,7 +16,7 @@ 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
+            warm.o sys_cacheflush.o upscale_aspect.o
 BIN       = gpsp.gpe 
 
 # Platform specific definitions 
@@ -34,7 +34,6 @@ 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
 
@@ -57,6 +56,9 @@ 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)