fixed windows and linux bugs in the pdsettings file generation

svn path=/trunk/; revision=5006

3 files changed, 120 insertions, 39 deletions

diff --git a/packages/linux_make/.pdsettings b/packages/linux_make/.pdsettings
index c07b90d2..ce5230eb 100644
--- a/packages/linux_make/.pdsettings
+++ b/packages/linux_make/.pdsettings
@@ -34,4 +34,4 @@ path1: /usr/X11R6/lib/X11/fonts
 path2: /usr/X11R6/lib/X11/fonts/TTF
 path3: /usr/lib/X11/fonts
 path4: /usr/share/fonts/truetype
-nloadlib: 4
+nloadlib: 30
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index f0f0c3cc..e367af1f 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -32,29 +32,6 @@ Windows Registry Editor Version 5.00
 "loadlib29"="unauthorized"
 "loadlib30"="vbap"
 ; delete any previous loadlib flags
-"loadlib8"="-"
-"loadlib9"="-"
-"loadlib10"="-"
-"loadlib11"="-"
-"loadlib12"="-"
-"loadlib13"="-"
-"loadlib14"="-"
-"loadlib15"="-"
-"loadlib16"="-"
-"loadlib17"="-"
-"loadlib18"="-"
-"loadlib19"="-"
-"loadlib20"="-"
-"loadlib21"="-"
-"loadlib22"="-"
-"loadlib23"="-"
-"loadlib24"="-"
-"loadlib25"="-"
-"loadlib26"="-"
-"loadlib27"="-"
-"loadlib28"="-"
-"loadlib29"="-"
-"loadlib30"="-"
 "loadlib31"="-"
 "loadlib32"="-"
 "loadlib33"="-"
@@ -74,9 +51,59 @@ Windows Registry Editor Version 5.00
 "loadlib47"="-"
 "loadlib48"="-"
 "loadlib49"="-"
+"loadlib50"="-"
+"loadlib51"="-"
+"loadlib52"="-"
+"loadlib53"="-"
+"loadlib54"="-"
+"loadlib55"="-"
+"loadlib56"="-"
+"loadlib57"="-"
+"loadlib58"="-"
+"loadlib59"="-"
+"loadlib60"="-"
+"loadlib61"="-"
+"loadlib62"="-"
+"loadlib63"="-"
+"loadlib64"="-"
+"loadlib65"="-"
+"loadlib66"="-"
+"loadlib67"="-"
+"loadlib68"="-"
+"loadlib69"="-"
+"loadlib70"="-"
+"loadlib71"="-"
+"loadlib72"="-"
+"loadlib73"="-"
+"loadlib74"="-"
+"loadlib75"="-"
+"loadlib76"="-"
+"loadlib77"="-"
+"loadlib78"="-"
+"loadlib79"="-"
+"loadlib80"="-"
+"loadlib81"="-"
+"loadlib82"="-"
+"loadlib83"="-"
+"loadlib84"="-"
+"loadlib85"="-"
+"loadlib86"="-"
+"loadlib87"="-"
+"loadlib88"="-"
+"loadlib89"="-"
+"loadlib90"="-"
+"loadlib91"="-"
+"loadlib92"="-"
+"loadlib93"="-"
+"loadlib94"="-"
+"loadlib95"="-"
+"loadlib96"="-"
+"loadlib97"="-"
+"loadlib98"="-"
+"loadlib99"="-"
+"loadlib100"="-"
 "path1"="%SystemRoot%/Fonts"
 ; delete all existing path flags
-"path1"="-"
 "path2"="-"
 "path3"="-"
 "path4"="-"
@@ -125,3 +152,54 @@ Windows Registry Editor Version 5.00
 "path47"="-"
 "path48"="-"
 "path49"="-"
+"path50"="-"
+"path51"="-"
+"path52"="-"
+"path53"="-"
+"path54"="-"
+"path55"="-"
+"path56"="-"
+"path57"="-"
+"path58"="-"
+"path59"="-"
+"path60"="-"
+"path61"="-"
+"path62"="-"
+"path63"="-"
+"path64"="-"
+"path65"="-"
+"path66"="-"
+"path67"="-"
+"path68"="-"
+"path69"="-"
+"path70"="-"
+"path71"="-"
+"path72"="-"
+"path73"="-"
+"path74"="-"
+"path75"="-"
+"path76"="-"
+"path77"="-"
+"path78"="-"
+"path79"="-"
+"path80"="-"
+"path81"="-"
+"path82"="-"
+"path83"="-"
+"path84"="-"
+"path85"="-"
+"path86"="-"
+"path87"="-"
+"path88"="-"
+"path89"="-"
+"path90"="-"
+"path91"="-"
+"path92"="-"
+"path93"="-"
+"path94"="-"
+"path95"="-"
+"path96"="-"
+"path97"="-"
+"path98"="-"
+"path99"="-"
+"path100"="-"
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index 04902915..1e8cd962 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -73,10 +73,10 @@ function print_windows ()
 
 function print_windows_fontpath ()
 {
-	 i=0
+	 j=0
 	 for fontpath in $WINDOWS_FONTPATH; do
-		  ((++i)) 
-		  echo "\"path${i}\"=\"${fontpath}\"" >> $WINDOWS_FILE
+		  ((++j)) 
+		  echo "\"path${j}\"=\"${fontpath}\"" >> $WINDOWS_FILE
 	 done
 }
 
@@ -97,27 +97,30 @@ for lib in $LIBS; do
 done
 echo " "
 
-# the .pd-settings file needs an end tag for the loadlib statements
-print_gnulinux_fontpath
-print_gnulinux_footer $i
-
-print_macosx_fontpath
-echo -e $MACOSX_FOOTER >> $MACOSX_FILE
-
+# the .pdsettings file needs a terminator with the lib count
+linux_end_count=$i
 
 # 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
+while [ $i -lt 100 ]; do
 	 ((++i)) 
+	 print_windows_delete loadlib $i
 done
 
 print_windows_fontpath
 
 # print lines to delete existing path flags
+i=1
 echo "; delete all existing path flags" >> $WINDOWS_FILE
-while [ $i -lt 50 ]; do
-	 print_windows_delete path $i
+while [ $i -lt 100 ]; do
 	 ((++i)) 
+	 print_windows_delete path $i
 done
 
+# the .pd-settings file needs an end tag for the loadlib statements
+print_gnulinux_fontpath
+print_gnulinux_footer $linux_end_count
+
+print_macosx_fontpath
+echo -e $MACOSX_FOOTER >> $MACOSX_FILE
+