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

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 030bab6..e7b4326 100644
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -1,115 +1,24 @@
-CROSS ?= arm-linux-
-
-# settings
-use_cyclone = 1
-#use_musashi = 1
-use_drz80 = 1
-use_sh2drc = 1
-#use_sh2mame = 1
-
-asm_memory = 1
-asm_render = 1
-asm_ym2612 = 1
-asm_misc = 1
-asm_cdpico = 1
-asm_cdmemory = 1
-asm_32xdraw = 1
-#profile = 1
-#drc_debug = 3
-
--include Makefile.local
-
-ifeq "$(debug_cyclone)" "1"
-use_cyclone = 1
-use_musashi = 1
-endif
-ifeq "$(use_musashi)" "1"
-# due to CPU stop flag acces
-asm_cdpico = 0
-asm_cdmemory = 0
-endif
-
-ARCH = arm
-DEFINES += ARM __GP2X__ IN_GP2X IN_EVDEV # BENCHMARK
-CFLAGS += -Wall -Winline -I../.. -I.
-ifeq ($(DEBUG),)
-CFLAGS += -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math
-endif
-CFLAGS += -mcpu=arm920t -mtune=arm920t
-ASFLAGS = -mcpu=arm920t -mfloat-abi=soft
-LDFLAGS += -lm -lpng
-
-CC = $(CROSS)gcc
-STRIP = $(CROSS)strip
-AS = $(CROSS)as
-LD = $(CROSS)ld
-OBJCOPY = $(CROSS)objcopy
-
-# frontend
-OBJS += plat.o warm.o pollux_set.o soc.o soc_mmsp2.o soc_pollux.o soc_dummy.o emu.o in_gp2x.o
-# 940 core control
-OBJS += 940ctl.o
-
-# ARM stuff
-OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
-OBJS += pico/sound/mix_arm.o
-
-# common
-OBJS += platform/common/emu.o platform/common/menu_pico.o platform/common/fonts.o platform/common/config.o \
-	platform/common/arm_utils.o platform/common/arm_linux.o platform/common/readpng.o \
-	platform/common/mp3_helix.o platform/common/input.o platform/common/main.o platform/common/mp3.o \
-	platform/linux/sndout_oss.o platform/linux/plat.o platform/linux/in_evdev.o
-
-# unzip
-OBJS += unzip/unzip.o unzip/unzip_stream.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
-
-vpath %.c = ../..
-vpath %.s = ../..
-vpath %.S = ../..
-
-DIRS += platform/gp2x platform/linux zlib unzip 
-
-
-all: mkdirs PicoDrive
-
-include ../common/common.mak
-include ../common/common_arm.mak
-include ../common/revision.mak
-
-CFLAGS += $(addprefix -D,$(DEFINES))
-
-# partial linking helps profiled builds due to section merging
-PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
-	$(LD) -r -o $@ $^
-
-# still using static, dynamic linking slows Wiz 1-10%
-# also libm on F100 is not compatible
-PicoDrive : PicoDrive.o
-	@echo ">>>" $@
-	$(CC) -static -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=$@.map
-ifeq ($(DEBUG),)
-	$(STRIP) $@
+# release packaging makefile
+
+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
 
-up: PicoDrive
-	@cp -v PicoDrive /mnt/gp2x/mnt/sd/emus/PicoDrive/
+all: rel
 
-clean: tidy
-	$(RM) PicoDrive
-tidy:
-	$(RM) $(OBJS)
+../../tools/textfilter: ../../tools/textfilter.c
+	make -C ../../tools/
 
-readme.txt: ../../tools/textfilter ../base_readme.txt
+readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
 	../../tools/textfilter ../base_readme.txt $@ GP2X
 
-# ----------- release -----------
-VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
 CODE940 = code940/pico940_v3.bin
 
-rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \
+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
@@ -118,11 +27,10 @@ rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \
 	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/
+	#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/
-