tag all pnd/wiz binaries

diff --git a/dist/make_cmn.sh b/dist/make_cmn.sh
index 4e9f3c3..48b918c 100755 (executable)
--- a/dist/make_cmn.sh
+++ b/dist/make_cmn.sh
@@ -2,16 +2,12 @@
 
 set -e
 
-if [ -z "$1" ]; then
-       echo "usage: $0 <out_dir>"
-       exit 1
-fi
-
-rm -rf $1
-mkdir $1
-cp gp2xmenu/gp2xmenu $1/
-cp -r gp2xmenu/gp2xmenu_data $1/
-cp loader/ginge_dyn $1/
-cp loader/ginge_sloader $1/
-cp readme.txt $1/
+rm -rf ${out}
+mkdir ${out}
+cp gp2xmenu/gp2xmenu${tag} ${out}/gp2xmenu
+cp -r gp2xmenu/gp2xmenu_data ${out}/
+cp prep/ginge_prep${tag} ${out}/ginge_prep
+cp loader/ginge_dyn${tag} ${out}/ginge_dyn
+cp loader/ginge_sloader${tag} ${out}/ginge_sloader
+cp readme.txt ${out}/
 

diff --git a/loader/Makefile b/loader/Makefile
index b546c7c..e42d2b2 100644 (file)
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -25,17 +25,19 @@ endif
 ifdef PND
 CFLAGS += -DPND
 OBJ += host_pnd.o
+TAG = _pnd
 endif
 ifdef WIZ
 CFLAGS += -DWIZ
 OBJ += host_wiz.o wiz_video_arm.o
+TAG = _wiz
 endif
 
 vpath %.c = ../common/
 vpath %.s = ../common/
 
-TARGET_S = ginge_sloader
-TARGET_D = ginge_dyn
+TARGET_S = ginge_sloader$(TAG)
+TARGET_D = ginge_dyn$(TAG)
 
 OBJ += emu.o host_fb.o cmn.o
 OBJ_S += $(OBJ) loader.o loader_$(ARCH).o patches.o
@@ -44,7 +46,7 @@ OBJ_D += $(OBJ) dl.o
 all: $(TARGET_S) $(TARGET_D)
 
 $(TARGET_S): LDFLAGS += -Wl,-T script_$(ARCH).lds
-$(TARGET_D): LDFLAGS += -ldl -Wl,--version-script=$(TARGET_D).symver
+$(TARGET_D): LDFLAGS += -ldl -Wl,--version-script=ginge_dyn.symver
 
 $(TARGET_S): $(OBJ_S)
        $(CC) -o $@ $^ -static $(LDFLAGS)

diff --git a/make_pnd.sh b/make_pnd.sh
index 84dc0a5..af7c9a7 100755 (executable)
--- a/make_pnd.sh
+++ b/make_pnd.sh
@@ -4,13 +4,13 @@ pnd_make=$HOME/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 set -e
 
-out=out_pnd
+export out=out_pnd
+export tag=_pnd
 
-dist/make_cmn.sh ${out}
+dist/make_cmn.sh
 mkdir -p ${out}/tools
 cp dist/ginge.sh ${out}/
 cp dist/ginge_dyn_eabi.sh ${out}/ginge_dyn.sh
-cp prep/ginge_prep_pnd ${out}/ginge_prep
 cp tools/cramfsck_eabi ${out}/tools/cramfsck
 cp -r lib ${out}/
 

diff --git a/make_wiz.sh b/make_wiz.sh
index 09d35bc..4ca3fea 100755 (executable)
--- a/make_wiz.sh
+++ b/make_wiz.sh
@@ -2,14 +2,14 @@
 
 set -e
 
-out=out_wiz
+export out=out_wiz
+export tag=_wiz
 
-dist/make_cmn.sh ${out}
+dist/make_cmn.sh
 mkdir -p ${out}/tools ${out}/lib
 cp dist/ginge.gpe ${out}/
 cp dist/ginge32.png ${out}/ginge.png
 cp dist/ginge_dyn_oabi.sh ${out}/ginge_dyn.sh
-cp prep/ginge_prep_wiz ${out}/ginge_prep
 cp lib/libSDL-1.2.so.0.7.0 ${out}/lib/libSDL-1.2.so.0
 cp tools/cramfsck_oabi ${out}/tools/cramfsck
 cp tools/warm_2.6.24.ko ${out}/tools/
@@ -17,4 +17,5 @@ cp tools/warm_2.6.24.ko ${out}/tools/
 dd if=/dev/zero of=${out}/swapfile bs=1M count=16
 
 cd ${out}
+rm ../ginge_wiz.zip 2> /dev/null || true
 zip -9r ../ginge_wiz.zip *