added new 'extra' libdir to default libraries since its not built with Pd-extended anymore

svn path=/trunk/; revision=14708

5 files changed, 21 insertions, 18 deletions

diff --git a/packages/darwin_app/org.puredata.pdextended.default.plist b/packages/darwin_app/org.puredata.pdextended.default.plist
index 04a2ae8b..176d29fa 100644
--- a/packages/darwin_app/org.puredata.pdextended.default.plist
+++ b/packages/darwin_app/org.puredata.pdextended.default.plist
@@ -11,13 +11,15 @@
 	<key>loadlib2</key>
 	<string>vanilla</string>
 	<key>loadlib3</key>
-	<string>Gem</string>
+	<string>extra</string>
 	<key>loadlib4</key>
-	<string>cyclone</string>
+	<string>Gem</string>
 	<key>loadlib5</key>
+	<string>cyclone</string>
+	<key>loadlib6</key>
 	<string>zexy</string>
 	<key>nloadlib</key>
-	<string>5</string>
+	<string>6</string>
 	<key>path1</key>
 	<string>/System/Library/Fonts</string>
 	<key>path2</key>
diff --git a/packages/linux_make/default.pdextended b/packages/linux_make/default.pdextended
index 1c65b54c..190b1219 100644
--- a/packages/linux_make/default.pdextended
+++ b/packages/linux_make/default.pdextended
@@ -4,9 +4,10 @@ defeatrt: 0
 flags:
 loadlib1: libdir
 loadlib2: vanilla
-loadlib3: Gem
-loadlib4: cyclone
-loadlib5: zexy
-nloadlib: 5
+loadlib3: extra
+loadlib4: Gem
+loadlib5: cyclone
+loadlib6: zexy
+nloadlib: 6
 path1: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
 npath: 1
diff --git a/packages/win32_inno/pd-extended.bat b/packages/win32_inno/pd-extended.bat
index 484eab71..41457372 100644
--- a/packages/win32_inno/pd-extended.bat
+++ b/packages/win32_inno/pd-extended.bat
@@ -1 +1 @@
-bin\pd.exe  -lib libdir -lib vanilla -lib Gem -lib cyclone -lib zexy
+bin\pd.exe  -lib libdir -lib vanilla -lib extra -lib Gem -lib cyclone -lib zexy
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 822b0fb4..d2a1f2db 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -82,11 +82,11 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData:
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: flags; ValueData: ; Tasks: libs; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2; ValueData: vanilla; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib3; ValueData: Gem; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib4; ValueData: cyclone; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib5; ValueData: zexy; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 5; Tasks: libs; Flags: uninsdeletekey
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib6; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib3; ValueData: extra; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib4; ValueData: Gem; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib5; ValueData: cyclone; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib6; ValueData: zexy; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 6; Tasks: libs; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib7; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib8; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib9; Flags: deletevalue; Tasks: libs
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 25f5a11a..bc2be999 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -4,12 +4,12 @@ Windows Registry Editor Version 5.00
 "flags"=""
 "loadlib1"="libdir"
 "loadlib2"="vanilla"
-"loadlib3"="Gem"
-"loadlib4"="cyclone"
-"loadlib5"="zexy"
-"nloadlib"=5
+"loadlib3"="extra"
+"loadlib4"="Gem"
+"loadlib5"="cyclone"
+"loadlib6"="zexy"
+"nloadlib"=6
 ; delete any previous loadlib flags
-"loadlib6"=-
 "loadlib7"=-
 "loadlib8"=-
 "loadlib9"=-