X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2FMakefile;h=e7b4326b812aa92c8198ae439cfd16d42755aeb6;hb=9db6a54485501b56b0f2f5db4d093c38fe495bda;hp=57bd81010aedafeb34633ef97223ffa84f5eabef;hpb=e55f0cbba1c4eef80e488e2bd8c090acb1acf057;p=picodrive.git

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 57bd810..e7b4326 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,258 +1,36 @@
+# release packaging makefile
 
-# you may or may not need to change this
-#devkit_path = x:/stuff/dev/devkitgp2x/
-export CROSS = arm-linux-
-#CROSS = $(devkit_path)bin/arm-linux-
-
-# settings
-#mz80 = 1
-#debug_cyclone = 1
-asm_memory = 1
-asm_render = 1
-asm_ym2612 = 1
-asm_misc = 1
-asm_cdpico = 1
-asm_cdmemory = 1
-amalgamate = 0
-#profile = 1
-#use_musashi = 1
-#up = 1
-
-
-ifeq "$(debug_cyclone)" "1"
-use_cyclone = 1
-use_musashi = 1
-endif
-ifeq "$(use_musashi)" "1"
-asm_cdpico = 0
-asm_memory = 0
-asm_cdmemory = 0
-else
-use_cyclone = 1
-endif
-
-DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
-COPT_COMMON = -static -Wall -Winline
-ifeq ($(DEBUG),)
-COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
-else
-COPT_COMMON += -ggdb
-endif
-ifeq "$(profile)" "1"
-COPT_COMMON += -fprofile-generate
-endif
-ifeq "$(profile)" "2"
-COPT_COMMON += -fprofile-use
-endif
-COPT = $(COPT_COMMON) -mtune=arm920t
-ASOPT = -mcpu=arm920t -mfloat-abi=soft
-GCC = $(CROSS)gcc
-STRIP = $(CROSS)strip
-AS = $(CROSS)as
-LD = $(CROSS)ld
-OBJCOPY = $(CROSS)objcopy
-
-# frontend
-OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
-# 940 core control
-OBJS += 940ctl.o
-
-# common
-OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
-	platform/common/arm_utils.o platform/common/readpng.o platform/common/mp3_helix.o
-
-# Pico
-ifeq "$(amalgamate)" "1"
-OBJS += ../../PicoAll.o
-else
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \
-		Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o
-# Pico - CD
-OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \
-		Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \
-		Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o
-endif
-# Pico - Pico
-OBJS += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o
-# Pico - carthw
-OBJS += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \
-		Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o
-
-# asm stuff
-ifeq "$(asm_render)" "1"
-DEFINC += -D_ASM_DRAW_C
-OBJS += Pico/draw_asm.o Pico/draw2_asm.o
-endif
-ifeq "$(asm_memory)" "1"
-DEFINC += -D_ASM_MEMORY_C
-OBJS += Pico/memory_asm.o
-endif
-ifeq "$(asm_ym2612)" "1"
-DEFINC += -D_ASM_YM2612_C
-OBJS += Pico/sound/ym2612_asm.o
-endif
-ifeq "$(asm_misc)" "1"
-DEFINC += -D_ASM_MISC_C
-OBJS += Pico/misc_asm.o
-OBJS += Pico/cd/misc_asm.o
+VER := $(shell head -n 1 ../common/version.h | \
+	sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
+BUILD := $(shell git describe HEAD | grep -- - | \
+	sed -e 's/.*\-\(.*\)\-.*/\1/')
+ifneq "$(BUILD)" ""
+VER := $(VER)_$(BUILD)
 endif
-ifeq "$(asm_cdpico)" "1"
-DEFINC += -D_ASM_CD_PICO_C
-OBJS += Pico/cd/pico_asm.o
-endif
-ifeq "$(asm_cdmemory)" "1"
-DEFINC += -D_ASM_CD_MEMORY_C
-OBJS += Pico/cd/memory_asm.o
-endif
-
-# Pico - sound
-ifneq "$(amalgamate)" "1"
-OBJS += Pico/sound/sound.o
-endif
-OBJS += Pico/sound/mix_asm.o
-OBJS += Pico/sound/sn76496.o Pico/sound/ym2612.o
-# zlib
-OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
-	zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o
-# unzip
-OBJS += unzip/unzip.o unzip/unzip_stream.o
-# debug
-ifeq "$(debug_cyclone)" "1"
-OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o
-endif
-# CPU cores
-ifeq "$(use_musashi)" "1"
-DEFINC += -DEMU_M68K
-OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
-endif
-ifeq "$(use_cyclone)" "1"
-DEFINC += -DEMU_C68K
-OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
-endif
-# drz80/mz80
-ifeq "$(mz80)" "1"
-DEFINC += -D_USE_MZ80
-OBJS += cpu/mz80/mz80.o
-else
-DEFINC += -D_USE_DRZ80
-OBJS += cpu/DrZ80/drz80.o
-endif
-
-vpath %.c = ../..
-vpath %.s = ../..
-vpath %.S = ../..
-DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \
-	zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
 
-
-all: mkdirs PicoDrive.gpe
-
-PicoDrive.gpe : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
-	@echo ">>>" $@
-	$(GCC) -o $@ $(COPT) $^ -lm -lpng -Wl,-Map=PicoDrive.map
-ifeq ($(DEBUG),)
-	$(STRIP) $@
-endif
-
-up: PicoDrive.gpe
-	@cp -v PicoDrive.gpe /mnt/gp2x/mnt/sd/emus/PicoDrive/
-
-#	@cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\
-
-# cleanup
-clean: tidy
-	$(RM) PicoDrive.gpe
-tidy:
-	$(RM) $(OBJS)
-#	rm -rf $(DIRS) # don't clean, gcda may be there
-#	@make -C ../../cpu/Cyclone/proj -f Makefile.linux clean
-
-
-clean_prof:
-	find ../.. -name '*.gcno' -delete
-	find ../.. -name '*.gcda' -delete
-
-
-mkdirs:
-	mkdir -p $(DIRS)
-
-.c.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-.s.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-.S.o:
-	@echo ">>>" $<
-	$(GCC) $(COPT) $(DEFINC) -c $< -o $@
-
-Pico/carthw/svp/compiler.o : ../../Pico/carthw/svp/ssp16.o ../../Pico/carthw/svp/gen_arm.c
-
-Pico/draw_asm.o : ../../Pico/Draw.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/draw2_asm.o : ../../Pico/Draw2.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/memory_asm.o : ../../Pico/Memory.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/sound/mix_asm.o : ../../Pico/sound/mix.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/misc_asm.o : ../../Pico/Misc.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s
-	@echo ">>>" $<
-	$(AS) $(ASOPT) $< -o $@
-
-# build Cyclone
-../../cpu/Cyclone/proj/Cyclone.s :
-	@echo building Cyclone...
-	@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
-
-../../cpu/musashi/m68kops.c :
-	@make -C ../../cpu/musashi
-
-Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
-Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
-
-# build helix libs
-../common/helix/$(CROSS)helix-mp3.a:
-	make -C ../common/helix clean all
-
-readme.txt: ../../tools/textfilter ../base_readme.txt
-	../../tools/textfilter ../base_readme.txt $@ GP2X
+all: rel
 
 ../../tools/textfilter: ../../tools/textfilter.c
-	make -C ../../tools/ textfilter
+	make -C ../../tools/
 
+readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
+	../../tools/textfilter ../base_readme.txt $@ GP2X
 
-# ----------- release -----------
-ifneq ($(findstring rel,$(MAKECMDGOALS)),)
-ifeq ($(VER),)
-$(error need VER)
-endif
-endif
-
-rel: PicoDrive.gpe code940/pico940_v3.bin readme.txt PicoDrive.man.txt PicoDrive.png ../game_def.cfg
-	zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
-	zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
-	mkdir bin_to_cso_mp3
-	cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
-	zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
-	rm -rf bin_to_cso_mp3
-
-code940/code940.bin:
+CODE940 = code940/pico940_v3.bin
+
+rel: ../../PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \
+		PicoDrive.png PicoDrive_s.png PicoDrive_t.png \
+		warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko \
+		../../pico/carthw.cfg
+	mkdir -p out/PicoDrive/skin/
+	cp $^ out/PicoDrive/
+	cp PicoDrive.ini out/
+	cp skin/*.png out/PicoDrive/skin/
+	cp skin/*.txt out/PicoDrive/skin/
+	#mkdir out/bin_to_cso_mp3
+	#cp ../../tools/bin_to_cso_mp3/* out/bin_to_cso_mp3/
+	cd out && zip -9 -r ../../../PicoDrive_$(VER).zip *
+	rm -rf out
+
+$(CODE940):
 	make -C code940/
-