Win32: load zexy hex-named objects as libraries and kludge to get them working (>~ <~ ||~ &&~ . ==~)

svn path=/trunk/; revision=16732

4 files changed, 18 insertions, 15 deletions

diff --git a/packages/win32_inno/pd-extended.bat b/packages/win32_inno/pd-extended.bat
index d3d169f8..1a19259a 100644
--- a/packages/win32_inno/pd-extended.bat
+++ b/packages/win32_inno/pd-extended.bat
@@ -1 +1 @@
-bin\pd.exe -noprefs -font-face "Lucida Console" -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
+bin\pd.exe -noprefs -font-face "Lucida Console"  -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 -lib zexy/0x260x260x7e -lib zexy/0x2e -lib zexy/0x3c0x7e -lib zexy/0x3d0x3d0x7e -lib zexy/0x3e0x7e -lib zexy/0x7c0x7c0x7e
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 4970a181..84c01198 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -108,13 +108,13 @@ Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2
 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: 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
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib32; Flags: deletevalue; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib33; Flags: deletevalue; Tasks: libs
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib34; Flags: deletevalue; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib29; ValueData: zexy/0x260x260x7e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib30; ValueData: zexy/0x2e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib31; ValueData: zexy/0x3c0x7e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib32; ValueData: zexy/0x3d0x3d0x7e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib33; ValueData: zexy/0x3e0x7e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib34; ValueData: zexy/0x7c0x7c0x7e; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib35; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: none; ValueName: loadlib37; Flags: deletevalue; Tasks: libs
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index c4da9252..e4e47ed3 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -30,14 +30,14 @@ Windows Registry Editor Version 5.00
 "loadlib26"="ekext"
 "loadlib27"="flatgui"
 "loadlib28"="chaos"
-"nloadlib"=28
+"loadlib29"="zexy/0x260x260x7e"
+"loadlib30"="zexy/0x2e"
+"loadlib31"="zexy/0x3c0x7e"
+"loadlib32"="zexy/0x3d0x3d0x7e"
+"loadlib33"="zexy/0x3e0x7e"
+"loadlib34"="zexy/0x7c0x7c0x7e"
+"nloadlib"=34
 ; delete any previous loadlib flags
-"loadlib29"=-
-"loadlib30"=-
-"loadlib31"=-
-"loadlib32"=-
-"loadlib33"=-
-"loadlib34"=-
 "loadlib35"=-
 "loadlib36"=-
 "loadlib37"=-
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index e00db37b..863457f0 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -174,6 +174,9 @@ print_windows_helppath
 
 i=0
 IFS=' '
+# add Windows-only libs here, these are objects whose names have chars
+# that cannot exist on Windows filesystems
+LIBS="$LIBS zexy/0x260x260x7e zexy/0x2e zexy/0x3c0x7e zexy/0x3d0x3d0x7e zexy/0x3e0x7e zexy/0x7c0x7c0x7e"
 for lib in $LIBS; do
 	 case "$lib" in
 		  pdp) ${ECHO} -n "(ignoring $lib on Windows) " ;;