From aa7b62e21979beb83a30bc53498287da831b492f Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Tue, 6 Dec 2016 22:02:20 -0500 Subject: [PATCH] fix #178: change library name "lyon" to "lyonpotpourri" --- externals/Makefile | 2 +- packages/darwin_app/org.puredata.pd-l2ork.default.plist | 4 +++- packages/linux_make/default.settings | 4 +++- packages/win32_inno/pd-inno.iss.in | 5 ++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/externals/Makefile b/externals/Makefile index bf5f0bd96..57ad5592a 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -1184,7 +1184,7 @@ loaders-libdir_clean: # Ivica named the libdir "lyon" for Pd-l2ork, but the submodule is named # lyonpotpourri. So we must do extra work to differentiate the two... LYON_SRC=lyonpotpourri -LYON_DEST=lyon +LYON_DEST=lyonpotpourri lyonpotpourri: make -C $(externals_src)/$(LYON_SRC) PD_PATH=$(pd_src) diff --git a/packages/darwin_app/org.puredata.pd-l2ork.default.plist b/packages/darwin_app/org.puredata.pd-l2ork.default.plist index 4759537ae..01e3c4cad 100644 --- a/packages/darwin_app/org.puredata.pd-l2ork.default.plist +++ b/packages/darwin_app/org.puredata.pd-l2ork.default.plist @@ -72,8 +72,10 @@ <string>pdp</string> <key>loadlib33</key> <string>disis</string> + <key>loadlib34</key> + <string>lyonpotpourri</string> <key>nloadlib</key> - <string>33</string> + <string>34</string> <key>path1</key> <string>/System/Library/Fonts</string> <key>path2</key> diff --git a/packages/linux_make/default.settings b/packages/linux_make/default.settings index e3d866689..514ff0a6a 100644 --- a/packages/linux_make/default.settings +++ b/packages/linux_make/default.settings @@ -34,7 +34,9 @@ loadlib30: ggee loadlib31: iem_anything loadlib32: ekext loadlib33: hexloader -nloadlib: 33 +loadlib34: disis +loadlib35: lyonpotpourri +nloadlib: 35 path1: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType path2: ~/pd-l2ork-externals path3: ~/L2Ork/PD/Abstractions diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in index 16566a040..0660633fc 100755 --- a/packages/win32_inno/pd-inno.iss.in +++ b/packages/win32_inno/pd-inno.iss.in @@ -111,9 +111,8 @@ Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib29; Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib30; ValueData: iem_anything; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib31; ValueData: ekext; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib32; ValueData: disis; Tasks: libs -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 32; Tasks: libs; Flags: uninsdeletekey -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib32; Flags: deletevalue; Tasks: libs -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib33; Flags: deletevalue; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ValueData: lyonpotpourri; Tasks: libs +Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 33; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib34; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib35; Flags: deletevalue; Tasks: libs Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs -- GitLab