X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=20964197516e9194c9aa460ba6bb6805c027a10b;hb=d5e0983c10e0ca717603dd1a406ff0d6e450e905;hp=2d57ebb29cb92c1f311f0f9e752dd9aad2d8ff00;hpb=5da9148dd11760c74db86d316d39ca329f8df24f;p=gpsp.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 2d57ebb..2096419 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -9,22 +9,32 @@ 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 cpu_speed.o cpuctrl.o               \
-            gp2xminilib.o font.o display.o speedtest.o cmdline.o daemon.o     \
-            arm_stub.o video_blend.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)
+OBJS      += pollux_dpc_set.o
+BIN       = gpsp_wiz
+else
+BIN       = gpsp_gp2x
+endif
 
 # 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                                                    \
 
 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:
 
@@ -42,8 +52,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: