updated to load libdir first, so it'll actually load the rest of the libdirs properly afterwards; wrote the generating script in the process to ignore pdp and pidip on windows

svn path=/trunk/; revision=8758

5 files changed, 183 insertions, 151 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 1d2a8f91..990516c1 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -7,80 +7,82 @@
 	<key>flags</key>
 	<string>-helppath /Library/Pd</string>
 	<key>loadlib1</key>
-	<string>Gem</string>
+	<string>libdir</string>
 	<key>loadlib2</key>
-	<string>cyclone</string>
+	<string>Gem</string>
 	<key>loadlib3</key>
-	<string>zexy</string>
+	<string>cyclone</string>
 	<key>loadlib4</key>
-	<string>creb</string>
+	<string>zexy</string>
 	<key>loadlib5</key>
-	<string>cxc</string>
+	<string>creb</string>
 	<key>loadlib6</key>
-	<string>ggee</string>
+	<string>cxc</string>
 	<key>loadlib7</key>
-	<string>iemlib</string>
+	<string>ggee</string>
 	<key>loadlib8</key>
-	<string>list-abs</string>
+	<string>iemlib</string>
 	<key>loadlib9</key>
-	<string>mapping</string>
+	<string>list-abs</string>
 	<key>loadlib10</key>
-	<string>markex</string>
+	<string>mapping</string>
 	<key>loadlib11</key>
-	<string>maxlib</string>
+	<string>markex</string>
 	<key>loadlib12</key>
-	<string>memento</string>
+	<string>maxlib</string>
 	<key>loadlib13</key>
-	<string>mjlib</string>
+	<string>memento</string>
 	<key>loadlib14</key>
-	<string>motex</string>
+	<string>mjlib</string>
 	<key>loadlib15</key>
-	<string>oscx</string>
+	<string>motex</string>
 	<key>loadlib16</key>
-	<string>pddp</string>
+	<string>oscx</string>
 	<key>loadlib17</key>
-	<string>pdogg</string>
+	<string>pddp</string>
 	<key>loadlib18</key>
-	<string>pixeltango</string>
+	<string>pdogg</string>
 	<key>loadlib19</key>
-	<string>pmpd</string>
+	<string>pixeltango</string>
 	<key>loadlib20</key>
-	<string>rradical</string>
+	<string>pmpd</string>
 	<key>loadlib21</key>
-	<string>sigpack</string>
+	<string>rradical</string>
 	<key>loadlib22</key>
-	<string>smlib</string>
+	<string>sigpack</string>
 	<key>loadlib23</key>
-	<string>toxy</string>
+	<string>smlib</string>
 	<key>loadlib24</key>
-	<string>unauthorized</string>
+	<string>toxy</string>
 	<key>loadlib25</key>
-	<string>vbap</string>
+	<string>unauthorized</string>
 	<key>loadlib26</key>
-	<string>pan</string>
+	<string>vbap</string>
 	<key>loadlib27</key>
-	<string>freeverb</string>
+	<string>pan</string>
 	<key>loadlib28</key>
-	<string>hcs</string>
+	<string>freeverb</string>
 	<key>loadlib29</key>
-	<string>jmmmp</string>
+	<string>hcs</string>
 	<key>loadlib30</key>
-	<string>ext13</string>
+	<string>jmmmp</string>
 	<key>loadlib31</key>
-	<string>hardware</string>
+	<string>ext13</string>
 	<key>loadlib32</key>
-	<string>deprecated</string>
+	<string>hardware</string>
 	<key>loadlib33</key>
-	<string>flatspace</string>
+	<string>deprecated</string>
 	<key>loadlib34</key>
-	<string>iem_anything</string>
+	<string>flatspace</string>
 	<key>loadlib35</key>
-	<string>pdp</string>
+	<string>iem_anything</string>
 	<key>loadlib36</key>
-	<string>pidip</string>
+	<string>pdp</string>
 	<key>loadlib37</key>
-	<string>flib</string>
+	<string>pidip</string>
 	<key>loadlib38</key>
+	<string>flib</string>
+	<key>loadlib39</key>
 	<string>ekext</string>
 	<key>path1</key>
 	<string>/Library/Pd</string>
diff --git a/packages/linux_make/default.pdsettings b/packages/linux_make/default.pdsettings
index ab03fe13..e01bea56 100644
--- a/packages/linux_make/default.pdsettings
+++ b/packages/linux_make/default.pdsettings
@@ -2,44 +2,45 @@ standardpath: 1
 verbose: 0
 defeatrt: 0
 flags: -helppath /usr/share/pd
-loadlib1: Gem
-loadlib2: cyclone
-loadlib3: zexy
-loadlib4: creb
-loadlib5: cxc
-loadlib6: ggee
-loadlib7: iemlib
-loadlib8: list-abs
-loadlib9: mapping
-loadlib10: markex
-loadlib11: maxlib
-loadlib12: memento
-loadlib13: mjlib
-loadlib14: motex
-loadlib15: oscx
-loadlib16: pddp
-loadlib17: pdogg
-loadlib18: pixeltango
-loadlib19: pmpd
-loadlib20: rradical
-loadlib21: sigpack
-loadlib22: smlib
-loadlib23: toxy
-loadlib24: unauthorized
-loadlib25: vbap
-loadlib26: pan
-loadlib27: freeverb
-loadlib28: hcs
-loadlib29: jmmmp
-loadlib30: ext13
-loadlib31: hardware
-loadlib32: deprecated
-loadlib33: flatspace
-loadlib34: iem_anything
-loadlib35: pdp
-loadlib36: pidip
-loadlib37: flib
-loadlib38: ekext
+loadlib1: libdir
+loadlib2: Gem
+loadlib3: cyclone
+loadlib4: zexy
+loadlib5: creb
+loadlib6: cxc
+loadlib7: ggee
+loadlib8: iemlib
+loadlib9: list-abs
+loadlib10: mapping
+loadlib11: markex
+loadlib12: maxlib
+loadlib13: memento
+loadlib14: mjlib
+loadlib15: motex
+loadlib16: oscx
+loadlib17: pddp
+loadlib18: pdogg
+loadlib19: pixeltango
+loadlib20: pmpd
+loadlib21: rradical
+loadlib22: sigpack
+loadlib23: smlib
+loadlib24: toxy
+loadlib25: unauthorized
+loadlib26: vbap
+loadlib27: pan
+loadlib28: freeverb
+loadlib29: hcs
+loadlib30: jmmmp
+loadlib31: ext13
+loadlib32: hardware
+loadlib33: deprecated
+loadlib34: flatspace
+loadlib35: iem_anything
+loadlib36: pdp
+loadlib37: pidip
+loadlib38: flib
+loadlib39: ekext
 path1: /usr/share/pd
 path2: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
-nloadlib: 38
+nloadlib: 39
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 1094cd2a..4d2cae7e 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -64,43 +64,46 @@ Root: HKCR; SubKey: Pure.Data\shell; ValueType: string; ValueData: open; Flags:
 Root: HKCR; SubKey: Pure.Data\shell\open\command; ValueType: string; ValueData: """{app}\bin\pd.exe"" -listdev ""%1"""; Flags: uninsdeletekey noerror; Tasks: fileassociations

 Root: HKCR; SubKey: .pd; ValueType: string; ValueData: Pure.Data; Flags: noerror uninsdeletekey; Tasks: fileassociations

 Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations

+;

+; add pd-inno_registry after this comment:

+

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib4; ValueData: zexy; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib5; ValueData: creb; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib6; ValueData: cxc; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib7; ValueData: iemlib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib8; ValueData: list-abs; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib9; ValueData: mapping; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib10; ValueData: markex; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib11; ValueData: maxlib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib12; ValueData: memento; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib13; ValueData: mjlib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib14; ValueData: motex; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib15; ValueData: oscx; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib16; ValueData: pddp; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib17; ValueData: pdogg; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib18; ValueData: pixeltango; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib19; ValueData: pmpd; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib20; ValueData: rradical; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib21; ValueData: sigpack; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib22; ValueData: smlib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib23; ValueData: toxy; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib24; ValueData: unauthorized; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib25; ValueData: vbap; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib26; ValueData: pan; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib27; ValueData: freeverb; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib28; ValueData: hcs; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib29; ValueData: jmmmp; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib30; ValueData: ext13; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: hardware; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: deprecated; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: flatspace; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: iem_anything; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: flib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib37; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib7; ValueData: ggee; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib8; ValueData: iemlib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib9; ValueData: list-abs; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib10; ValueData: mapping; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib11; ValueData: markex; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib12; ValueData: maxlib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib13; ValueData: memento; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib14; ValueData: mjlib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib15; ValueData: motex; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib16; ValueData: oscx; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib17; ValueData: pddp; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib18; ValueData: pdogg; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib19; ValueData: pixeltango; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib20; ValueData: pmpd; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib21; ValueData: rradical; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib22; ValueData: sigpack; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib23; ValueData: smlib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib24; ValueData: toxy; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib25; ValueData: unauthorized; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib26; ValueData: vbap; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib27; ValueData: pan; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib28; ValueData: freeverb; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib29; ValueData: hcs; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib30; ValueData: jmmmp; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: ext13; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: hardware; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: deprecated; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: flatspace; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: iem_anything; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: flib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: ekext; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib38; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib39; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib40; Flags: deletevalue; Tasks: libs

@@ -164,7 +167,7 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib97; Flags: d
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib98; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib99; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib100; Flags: deletevalue; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path1; ValueData: hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00; Tasks: libs

+"path1"=hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path2; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path3; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs

@@ -261,9 +264,9 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path94; Flags: dele
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path95; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path96; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path97; Flags: deletevalue; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path98; Flags: deletevalue

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path99; Flags: deletevalue

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path100; Flags: deletevalue

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path98; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path99; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path100; Flags: deletevalue; Tasks: libs

 

 [_ISTool]

 Use7zip=true

diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index e20d9946..bf5f61fe 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -1,44 +1,44 @@
 Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd]
-"loadlib1"="Gem"
-"loadlib2"="cyclone"
-"loadlib3"="zexy"
-"loadlib4"="creb"
-"loadlib5"="cxc"
-"loadlib6"="ggee"
-"loadlib7"="iemlib"
-"loadlib8"="list-abs"
-"loadlib9"="mapping"
-"loadlib10"="markex"
-"loadlib11"="maxlib"
-"loadlib12"="memento"
-"loadlib13"="mjlib"
-"loadlib14"="motex"
-"loadlib15"="oscx"
-"loadlib16"="pddp"
-"loadlib17"="pdogg"
-"loadlib18"="pixeltango"
-"loadlib19"="pmpd"
-"loadlib20"="rradical"
-"loadlib21"="sigpack"
-"loadlib22"="smlib"
-"loadlib23"="toxy"
-"loadlib24"="unauthorized"
-"loadlib25"="vbap"
-"loadlib26"="pan"
-"loadlib27"="freeverb"
-"loadlib28"="hcs"
-"loadlib29"="jmmmp"
-"loadlib30"="ext13"
-"loadlib31"="hardware"
-"loadlib32"="deprecated"
-"loadlib33"="flatspace"
-"loadlib34"="iem_anything"
-"loadlib35"="flib"
-"loadlib36"="ekext"
+"loadlib1"="libdir"
+"loadlib2"="Gem"
+"loadlib3"="cyclone"
+"loadlib4"="zexy"
+"loadlib5"="creb"
+"loadlib6"="cxc"
+"loadlib7"="ggee"
+"loadlib8"="iemlib"
+"loadlib9"="list-abs"
+"loadlib10"="mapping"
+"loadlib11"="markex"
+"loadlib12"="maxlib"
+"loadlib13"="memento"
+"loadlib14"="mjlib"
+"loadlib15"="motex"
+"loadlib16"="oscx"
+"loadlib17"="pddp"
+"loadlib18"="pdogg"
+"loadlib19"="pixeltango"
+"loadlib20"="pmpd"
+"loadlib21"="rradical"
+"loadlib22"="sigpack"
+"loadlib23"="smlib"
+"loadlib24"="toxy"
+"loadlib25"="unauthorized"
+"loadlib26"="vbap"
+"loadlib27"="pan"
+"loadlib28"="freeverb"
+"loadlib29"="hcs"
+"loadlib30"="jmmmp"
+"loadlib31"="ext13"
+"loadlib32"="hardware"
+"loadlib33"="deprecated"
+"loadlib34"="flatspace"
+"loadlib35"="iem_anything"
+"loadlib36"="flib"
+"loadlib37"="ekext"
 ; delete any previous loadlib flags
-"loadlib37"=-
 "loadlib38"=-
 "loadlib39"=-
 "loadlib40"=-
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index d15327d7..2fd4e972 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-LIBS="Gem cyclone zexy creb cxc ggee iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware deprecated flatspace iem_anything pdp pidip flib ekext"
+LIBS="libdir Gem cyclone zexy creb cxc ggee iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware deprecated flatspace iem_anything pdp pidip flib ekext"
 
 GNULINUX_FONTPATH="/usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 MACOSX_FONTPATH="/Library/Pd /System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf"
+# TODO this needs to be changed to add to a user dir like %USERPROFILE% (like /Library/Pd)
 WINDOWS_FONTPATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
 
 SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
@@ -12,7 +13,7 @@ ROOT_DIR=${SCRIPT_DIR}/../packages
 GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdsettings
 MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist
 WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
-
+WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno_registry.reg
 
 GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath /usr/share/pd'
 
@@ -25,9 +26,15 @@ MACOSX_FOOTER='</dict>\n
 WINDOWS_HEADER='Windows Registry Editor Version 5.00\n\n[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]'
 
 
+# the file associations should be added here
+WINDOWS_INNO_HEADER=''
+
+
 echo -e $GNULINUX_HEADER > $GNULINUX_FILE
 echo -e $MACOSX_HEADER > $MACOSX_FILE
 echo -e $WINDOWS_HEADER > $WINDOWS_FILE
+echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_FILE
+
 
 # GNU/Linux -------------------------------------------------------------------#
 print_gnulinux ()
@@ -70,6 +77,7 @@ print_macosx_fontpath ()
 print_windows ()
 {
 	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
+	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs"  >> $WINDOWS_INNO_FILE
 }
 
 print_windows_fontpath ()
@@ -78,29 +86,47 @@ print_windows_fontpath ()
 	 for fontpath in $WINDOWS_FONTPATH; do
 		  ((++j)) 
 		  echo "\"path${j}\"=${fontpath}" >> $WINDOWS_FILE
+		  echo "\"path${j}\"=${fontpath}" >> $WINDOWS_INNO_FILE
 	 done
 }
 
 print_windows_delete ()
 {
 	 echo "\"${1}${2}\"=-" >> $WINDOWS_FILE
+	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_FILE
 }
 
 #==============================================================================#
 
+echo "Running for GNU/Linux and Darwin:"
 i=0
 for lib in $LIBS; do
 	 ((++i)) 
 	 echo -n "$lib "
 	 print_gnulinux $i $lib
 	 print_macosx $i $lib
-	 print_windows $i $lib
 done
 echo " "
 
 # the .pdsettings file needs a terminator with the lib count
 linux_end_count=$i
 
+# run separately so some libs can be excluded on Windows
+echo "Running for Windows:"
+i=0
+for lib in $LIBS; do
+	 case "$lib" in
+		  pdp) echo -n "(ignoring $lib on Windows) " ;;
+		  pidip) echo -n "(ignoring $lib on Windows) " ;;
+		  *)
+				echo -n "$lib "
+				((++i)) 
+				print_windows $i $lib
+				;;
+	 esac
+done
+echo " "
+
 # print lines to delete existing loadlib flags
 echo "; delete any previous loadlib flags" >> $WINDOWS_FILE
 while [ $i -lt 100 ]; do