X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2FMakefile;h=595db535dac8e3a40ddeeeb65ce36bb331f6049e;hb=58bf1ea9cb04d3a0b7f218c6361861cd27d31f31;hp=f698a8f7379fcc37efd56a8e867da8d8d3f46a3c;hpb=90014ab45fb805fafdc866eed02f644d882cf32a;p=libpicofe.git

diff --git a/gp2x/Makefile b/gp2x/Makefile
index f698a8f..595db53 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -1,7 +1,7 @@
 
 # you may or may not need to change this
 #devkit_path = x:/stuff/dev/devkitgp2x/
-CROSS = arm-linux-
+export CROSS = arm-linux-
 #CROSS = $(devkit_path)bin/arm-linux-
 
 # settings
@@ -13,7 +13,7 @@ asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
 asm_cdmemory = 1
-amalgamate = 1
+amalgamate = 0
 #profile = 1
 #use_musashi = 1
 #up = 1
@@ -32,7 +32,12 @@ use_cyclone = 1
 endif
 
 DEFINC = -I../.. -I. -DARM -D__GP2X__ -D_UNZIP_SUPPORT # -DBENCHMARK
-COPT_COMMON = -static -Wall -O3 -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math # -s
+COPT_COMMON = -static -Wall -Winline
+ifeq ($(DEBUG),)
+COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
+else
+COPT_COMMON += -ggdb
+endif
 ifeq "$(profile)" "1"
 COPT_COMMON += -fprofile-generate
 endif
@@ -48,10 +53,14 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy
 
 # frontend
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 # 940 core control
 OBJS += 940ctl.o
 
+# common
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o \
+	../common/readpng.o ../common/mp3_helix.o
+
 # Pico
 ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o
@@ -103,8 +112,6 @@ OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/i
 	../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
 OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
-# mp3
-OBJS += mp3.o
 # debug
 ifeq "$(debug_cyclone)" "1"
 OBJS += ../../Pico/_cyclone_debug.o ../../cpu/musashi/m68kdasm.o
@@ -130,7 +137,7 @@ endif
 
 all: PicoDrive.gpe
 
-PicoDrive.gpe : $(OBJS) helix/helix_mp3.a
+PicoDrive.gpe : $(OBJS) ../common/helix/helix_mp3.a
 	@echo $@
 	@$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
 ifeq ($(DEBUG),)
@@ -148,7 +155,7 @@ up: PicoDrive.gpe
 #	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
 
 
-testrefr.gpe : test.o gp2x.o asmutils.o
+testrefr.gpe : test.o gp2x.o
 	@echo $@
 	@$(GCC) $(COPT) $^ -o $@
 	@$(STRIP) $@
@@ -175,7 +182,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
-../../Pico/misc_asm.o : ../../Pico/misc.s
+../../Pico/misc_asm.o : ../../Pico/Misc.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
@@ -184,7 +191,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 ../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
-../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s
+../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
 	@echo $<
 	@$(AS) $(ASOPT) $< -o $@
 
@@ -198,8 +205,14 @@ testrefr.gpe : test.o gp2x.o asmutils.o
 
 
 # build helix libs
-helix/helix_mp3.a:
-	make -C helix
+../common/helix/helix_mp3.a:
+	make -C ../common/helix
+
+readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ GP2X
+
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/ textfilter
 
 
 # cleanup
@@ -221,7 +234,7 @@ $(error need VER)
 endif
 endif
 
-rel: PicoDrive.gpe code940/pico940.bin ../readme.txt config.txt PicoDrive.man.txt PicoDrive.png
+rel: PicoDrive.gpe code940/pico940.bin readme.txt PicoDrive.man.txt PicoDrive.png
 	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
 	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt