added mapping lib; and defeatrt on Mac OS X

svn path=/trunk/; revision=4720

3 files changed, 69 insertions, 43 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 6c11cf57..50088f11 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+   <key>defeatrt</key>
+   <string>1</string>
 	<key>loadlib1</key>
 	<string>Gem</string>
 	<key>loadlib2</key>
@@ -23,44 +25,48 @@
 	<key>loadlib10</key>
 	<string>liblist</string>
 	<key>loadlib11</key>
-	<string>markex</string>
+	<string>list-abs</string>
 	<key>loadlib12</key>
-	<string>maxlib</string>
+	<string>mapping</string>
 	<key>loadlib13</key>
-	<string>memento</string>
+	<string>markex</string>
 	<key>loadlib14</key>
-	<string>mjlib</string>
+	<string>maxlib</string>
 	<key>loadlib15</key>
-	<string>motex</string>
+	<string>memento</string>
 	<key>loadlib16</key>
-	<string>oscx</string>
+	<string>mjlib</string>
 	<key>loadlib17</key>
-	<string>pddp</string>
+	<string>motex</string>
 	<key>loadlib18</key>
-	<string>pdogg</string>
+	<string>oscx</string>
 	<key>loadlib19</key>
-	<string>pdp</string>
+	<string>pddp</string>
 	<key>loadlib20</key>
-	<string>pidip</string>
+	<string>pdogg</string>
 	<key>loadlib21</key>
-	<string>pixeltango</string>
+	<string>pdp</string>
 	<key>loadlib22</key>
-	<string>pmpd</string>
+	<string>pidip</string>
 	<key>loadlib23</key>
-	<string>rradical</string>
+	<string>pixeltango</string>
 	<key>loadlib24</key>
-	<string>sigpack</string>
+	<string>pmpd</string>
 	<key>loadlib25</key>
-	<string>smlib</string>
+	<string>rradical</string>
 	<key>loadlib26</key>
-	<string>toxy</string>
+	<string>sigpack</string>
 	<key>loadlib27</key>
-	<string>unauthorized</string>
+	<string>smlib</string>
 	<key>loadlib28</key>
-	<string>vasp</string>
+	<string>toxy</string>
 	<key>loadlib29</key>
-	<string>vbap</string>
+	<string>unauthorized</string>
 	<key>loadlib30</key>
+	<string>vasp</string>
+	<key>loadlib31</key>
+	<string>vbap</string>
+	<key>loadlib32</key>
 	<string>xsample</string>
 </dict>
  </plist>
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index c8b14dda..92a9b1db 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -11,29 +11,29 @@ Windows Registry Editor Version 5.00
 "loadlib8"="iemabs"
 "loadlib9"="iemmatrix"
 "loadlib10"="liblist"
-"loadlib11"="markex"
-"loadlib12"="maxlib"
-"loadlib13"="memento"
-"loadlib14"="mjlib"
-"loadlib15"="motex"
-"loadlib16"="oscx"
-"loadlib17"="pddp"
-"loadlib18"="pdogg"
-"loadlib19"="pdp"
-"loadlib20"="pidip"
-"loadlib21"="pixeltango"
-"loadlib22"="pmpd"
-"loadlib23"="rradical"
-"loadlib24"="sigpack"
-"loadlib25"="smlib"
-"loadlib26"="toxy"
-"loadlib27"="unauthorized"
-"loadlib28"="vasp"
-"loadlib29"="vbap"
-"loadlib30"="xsample"
+"loadlib11"="list-abs"
+"loadlib12"="mapping"
+"loadlib13"="markex"
+"loadlib14"="maxlib"
+"loadlib15"="memento"
+"loadlib16"="mjlib"
+"loadlib17"="motex"
+"loadlib18"="oscx"
+"loadlib19"="pddp"
+"loadlib20"="pdogg"
+"loadlib21"="pdp"
+"loadlib22"="pidip"
+"loadlib23"="pixeltango"
+"loadlib24"="pmpd"
+"loadlib25"="rradical"
+"loadlib26"="sigpack"
+"loadlib27"="smlib"
+"loadlib28"="toxy"
+"loadlib29"="unauthorized"
+"loadlib30"="vasp"
+"loadlib31"="vbap"
+"loadlib32"="xsample"
 ; delete any previous loadlib flags
-"loadlib31"="-"
-"loadlib32"="-"
 "loadlib33"="-"
 "loadlib34"="-"
 "loadlib35"="-"
@@ -51,7 +51,7 @@ Windows Registry Editor Version 5.00
 "loadlib47"="-"
 "loadlib48"="-"
 "loadlib49"="-"
-; delete all existing path  flags
+; delete all existing path flags
 "path1"="-"
 "path2"="-"
 "path3"="-"
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index d07ec252..cf2da3fc 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LIBS="Gem cyclone zexy cxc ext13 iemabs iemmatrix markex maxlib memento mjlib motex oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap xsample"
+LIBS="Gem cyclone zexy cxc ext13 fftease hid iemabs iemmatrix liblist list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vasp vbap xsample"
 
 
 ROOT_DIR=~/cvs/pure-data/packages
@@ -33,6 +33,11 @@ function print_windows ()
 	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
 }
 
+function print_windows_delete ()
+{
+	 echo "\"${1}${2}\"=\"-\"" >> $WINDOWS_FILE
+}
+
 
 i=1
 for lib in $LIBS; do
@@ -43,4 +48,19 @@ for lib in $LIBS; do
 done
 echo " "
 
+# print lines to delete existing loadlib flags
+echo "; delete any previous loadlib flags" >> $WINDOWS_FILE
+while [ $i -lt 50 ]; do
+	 print_windows_delete loadlib $i
+	 ((++i)) 
+done
+
+i=1
+# print lines to delete existing path flags
+echo "; delete all existing path flags" >> $WINDOWS_FILE
+while [ $i -lt 50 ]; do
+	 print_windows_delete path $i
+	 ((++i)) 
+done
+
 echo -e $MACOSX_FOOTER >> $MACOSX_FILE