From c451feed31563dd07fb203a1557c986683abb6e6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 20 Oct 2011 05:03:04 +0000
Subject: for the final step in eliminating the 'flatspace' hacked collection
 from Pd-extended, add the 'chaos' lib as its own standalone library, but load
 by default since flatspace was loaded by default

svn path=/trunk/; revision=15627
---
 packages/darwin_app/org.puredata.pdextended.default.plist | 4 +++-
 packages/linux_make/default.pdextended                    | 5 +++--
 packages/win32_inno/pd-extended.bat                       | 2 +-
 packages/win32_inno/pd-inno.iss.in                        | 4 ++--
 packages/win32_inno/pd-settings.reg                       | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/darwin_app/org.puredata.pdextended.default.plist b/packages/darwin_app/org.puredata.pdextended.default.plist
index 5eace4b2..67643859 100644
--- a/packages/darwin_app/org.puredata.pdextended.default.plist
+++ b/packages/darwin_app/org.puredata.pdextended.default.plist
@@ -61,9 +61,11 @@
 	<key>loadlib27</key>
 	<string>flatgui</string>
 	<key>loadlib28</key>
+	<string>chaos</string>
+	<key>loadlib29</key>
 	<string>pdp</string>
 	<key>nloadlib</key>
-	<string>28</string>
+	<string>29</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 f44234cb..80a05b67 100644
--- a/packages/linux_make/default.pdextended
+++ b/packages/linux_make/default.pdextended
@@ -29,7 +29,8 @@ loadlib24: ggee
 loadlib25: iem_anything
 loadlib26: ekext
 loadlib27: flatgui
-loadlib28: pdp
-nloadlib: 28
+loadlib28: chaos
+loadlib29: pdp
+nloadlib: 29
 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 54d3b7e9..e55939fb 100644
--- a/packages/win32_inno/pd-extended.bat
+++ b/packages/win32_inno/pd-extended.bat
@@ -1 +1 @@
-bin\pd.exe -noprefs  -lib Gem -lib cyclone -lib zexy -lib creb -lib cxc -lib iemlib -lib list-abs -lib mapping -lib markex -lib maxlib -lib mjlib -lib motex -lib oscx -lib pddp -lib pdogg -lib pmpd -lib sigpack -lib smlib -lib unauthorized -lib pan -lib hcs -lib jmmmp -lib ext13 -lib ggee -lib iem_anything -lib ekext -lib flatgui
+bin\pd.exe -noprefs  -lib Gem -lib cyclone -lib zexy -lib creb -lib cxc -lib iemlib -lib list-abs -lib mapping -lib markex -lib maxlib -lib mjlib -lib motex -lib oscx -lib pddp -lib pdogg -lib pmpd -lib sigpack -lib smlib -lib unauthorized -lib pan -lib hcs -lib jmmmp -lib ext13 -lib ggee -lib iem_anything -lib ekext -lib flatgui -lib chaos
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 7fe049b2..b697eb9d 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -107,8 +107,8 @@ Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib25; ValueData: iem_anything; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib26; ValueData: ekext; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib27; ValueData: flatgui; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 27; Tasks: libs; Flags: uninsdeletekey
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib28; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib28; ValueData: chaos; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 28; Tasks: libs; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib29; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib30; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib31; Flags: deletevalue; Tasks: libs
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index d4d063bb..c4da9252 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -29,9 +29,9 @@ Windows Registry Editor Version 5.00
 "loadlib25"="iem_anything"
 "loadlib26"="ekext"
 "loadlib27"="flatgui"
-"nloadlib"=27
+"loadlib28"="chaos"
+"nloadlib"=28
 ; delete any previous loadlib flags
-"loadlib28"=-
 "loadlib29"=-
 "loadlib30"=-
 "loadlib31"=-
-- 
cgit v1.2.1