From 419055f90cc750b68d3e42e3ffdc6b418c10bc96 Mon Sep 17 00:00:00 2001
From: Drohne 307 <drohne307@kurzepost.de>
Date: Sat, 31 May 2014 10:43:37 +0200
Subject: [PATCH] =?UTF-8?q?Optimierungslevel=20als=20Konstante=20rausgezog?=
 =?UTF-8?q?en,=20Output-Verzeichnisse=20bei=20Compile-Aufrufen=20erg=C3=A4?=
 =?UTF-8?q?nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 make.sh | 55 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/make.sh b/make.sh
index f474a60..80a483d 100755
--- a/make.sh
+++ b/make.sh
@@ -1,9 +1,11 @@
 #! /bin/sh
-
+ 
 # Definitionen
 ##D="-D __DEBUG -D __LANG_EN"
 ##D="-D __LANG_EN"
 D="-D __LANG_DE"
+OPT="-O a"
+##OPT=""
 
 # Pfade
 bin="../Bin"
@@ -13,6 +15,7 @@ sdsys="${bin}/sdcard/system"
 flash="${bin}/flash"
 libpath="lib"
 BSTC="bstc"
+##BSTC="../open-source-spin-compiler-read-only/openspin"
 
 # ----------------------------------------------------------------
 # Alte Versionen löschen
@@ -25,47 +28,47 @@ mkdir ${flash}
 # Flashdateien erzeugen
 # --> bin/flash
 
-${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_HSS -D __ADM_HSS_PLAY -D __ADM_WAV -D __ADM_RTC -D __ADM_COM -b -O a flash/administra/admflash.spin
-cp admflash.binary ${flash}
-mv admflash.binary ${sdsys}/admsys.adm
+${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_HSS -D __ADM_HSS_PLAY -D __ADM_WAV -D __ADM_RTC -D __ADM_COM -b ${OPT} -o flash/administra/admflash.binary flash/administra/admflash.spin
+cp flash/administra/admflash.binary ${flash}
+mv flash/administra/admflash.binary ${sdsys}/admsys.adm
 
-${BSTC} -L ${libpath} ${D} -D __VGA -b -O a flash/bellatrix/belflash.spin
-cp belflash.binary ${flash}
-mv belflash.binary ${sdsys}/vga.bel
+${BSTC} -L ${libpath} ${D} -D __VGA -b ${OPT} -o flash/bellatrix/belflash.binary flash/bellatrix/belflash.spin
+cp flash/bellatrix/belflash.binary ${flash}
+mv flash/bellatrix/belflash.binary ${sdsys}/vga.bel
 
-${BSTC} -L ${libpath} ${D} -D __TV -b -O a flash/bellatrix/belflash.spin
-mv belflash.binary ${sdsys}/tv.bel
+${BSTC} -L ${libpath} ${D} -D __TV -b ${OPT} -o flash/bellatrix/belflash.binary flash/bellatrix/belflash.spin
+mv flash/bellatrix/belflash.binary ${sdsys}/tv.bel
 
-${BSTC} -L ${libpath} ${D} -D regime -b -O a flash/regnatix/regflash.spin
-mv regflash.binary ${flash}
+${BSTC} -L ${libpath} ${D} -D regime -b ${OPT} -o flash/regnatix/regflash.binary flash/regnatix/regflash.spin
+mv flash/regnatix/regflash.binary ${flash}
 
-${BSTC} -L ${libpath} ${D} -D forth -b -O a flash/regnatix/regflash.spin
-mv regflash.binary ${flash}/regforth.binary
+${BSTC} -L ${libpath} ${D} -D forth -b ${OPT} -o flash/regnatix/regflash.binary flash/regnatix/regflash.spin
+mv  flash/regnatix/regflash.binary ${flash}/regforth.binary
 
 # ----------------------------------------------------------------
 # Startdateie erzeugen
 # reg.sys	(Regime)
 # --> bin/sdcard\
 
-${BSTC} -L ${libpath} ${D} -b -O a system/regnatix/regime.spin
-mv regime.binary ${sd}/reg.sys
+${BSTC} -L ${libpath} ${D} -b ${OPT} -o system/regnatix/regime.binary system/regnatix/regime.spin
+mv system/regnatix/regime.binary ${sd}/reg.sys
 
 # ----------------------------------------------------------------
 # Slave-Dateien erzeugen
 # admsid, admay, admnet
 # htxt, g0key
 
-${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_SID -b -O a flash/administra/admflash.spin
-mv admflash.binary ${sdsys}/admsid.adm
-${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_AYS -b -O a flash/administra/admflash.spin
-mv admflash.binary ${sdsys}/admay.adm
-${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_HSS -D __ADM_LAN -D __ADM_RTC -D __ADM_COM -b -O a flash/administra/admflash.spin
-mv admflash.binary ${sdsys}/admnet.adm
+${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_SID -b ${OPT} -o flash/administra/admflash.binary flash/administra/admflash.spin
+mv flash/administra/admflash.binary ${sdsys}/admsid.adm
+${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_AYS -b ${OPT} -o flash/administra/admflash.binary flash/administra/admflash.spin
+mv flash/administra/admflash.binary ${sdsys}/admay.adm
+${BSTC} -L ${libpath} ${D} -D __ADM_FAT -D __ADM_HSS -D __ADM_LAN -D __ADM_RTC -D __ADM_COM -b ${OPT} -o flash/administra/admflash.binary flash/administra/admflash.spin
+mv flash/administra/admflash.binary ${sdsys}/admnet.adm
 
-${BSTC} -L ${libpath} ${D} -b -O a system/bellatrix/bel-htext/htext.spin
-mv htext.binary ${sdsys}/htext.bel
-${BSTC} -L ${libpath} ${D} -b -O a system/bellatrix/bel-g0/g0key.spin
-mv g0key.binary ${sdsys}/g0key.bel
+${BSTC} -L ${libpath} ${D} -b ${OPT} -o system/bellatrix/bel-htext/htext.binary system/bellatrix/bel-htext/htext.spin
+mv system/bellatrix/bel-htext/htext.binary ${sdsys}/htext.bel
+${BSTC} -L ${libpath} ${D} -b ${OPT} -o  system/bellatrix/bel-g0/g0key.binary system/bellatrix/bel-g0/g0key.spin
+mv  system/bellatrix/bel-g0/g0key.binary ${sdsys}/g0key.bel
 
 # ----------------------------------------------------------------
 # Systemdateien erzeugen
@@ -74,7 +77,7 @@ mv g0key.binary ${sdsys}/g0key.bel
 # --> bin/sdcard/system/
 
 for FILE in system/regnatix/*.spin ; do 
-    ${BSTC} -L ${libpath} ${D} -b -O a ${FILE}
+    ${BSTC} -L ${libpath} ${D} -b ${OPT} ${FILE}
     BASE="`basename ${FILE} .spin`"
     mv "${BASE}.binary" "${sdsys}/${BASE}.bin"
 done