From 391587f9e5e1805e8eb07423cb363255cd528726 Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Mon, 14 Aug 2017 14:53:52 -0400 Subject: [PATCH] remove external hexloader loader now that we have rudimentary hexloading in the main loader --- externals/Makefile | 25 +------------------ .../org.puredata.pd-l2ork.default.plist | 6 ++--- packages/linux_make/default.settings | 7 +++--- packages/win32_inno/pd-inno.iss.in | 15 +++++------ 4 files changed, 12 insertions(+), 41 deletions(-) diff --git a/externals/Makefile b/externals/Makefile index ef87240de..5e67a92a1 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -129,7 +129,7 @@ CXXFLAGS = $(CFLAGS) # # WARNING! this MUST be all on one line because the automatic package # building scripts rely on it being that way. -LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-hexloader loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy +LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy # DISABLED: flatgui @@ -1108,29 +1108,6 @@ jasch_lib_clean: -rm -f -- $(externals_src)/jasch_lib/*/*.bak -rm -f -- $(externals_src)/jasch_lib/*/*.*~ - -#------------------------------------------------------------------------------# -# LOADERS-HEXLOADER -LOADERS-HEXLOADER_NAME = hexloader -LOADERS-HEXLOADER_OBJECTS := $(externals_src)/loaders/hexloader/hexloader.c -loaders-hexloader: $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION)) - echo $(LOADERS-HEXLOADER_OBJECTS) - -loaders-hexloader_install: loaders-hexloader - install -d $(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME) - install -p $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION)) \ - $(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME) - install -p $(externals_src)/loaders/hexloader/README.txt \ - $(externals_src)/loaders/hexloader/FAQ.txt \ - $(DESTDIR)$(objectsdir)/$(LOADERS-HEXLOADER_NAME) - -loaders-hexloader_clean: - -rm -f -- $(LOADERS-HEXLOADER_OBJECTS:.c=.$(EXTENSION)) - -rm -f -- $(externals_src)/loaders/hexloader/*.o - -rm -f -- $(externals_src)/loaders/*.bak - -rm -f -- $(externals_src)/loaders/hexloader/*.*~ - - #------------------------------------------------------------------------------# # LOADERS-LIBDIR loaders-libdir: diff --git a/packages/darwin_app/org.puredata.pd-l2ork.default.plist b/packages/darwin_app/org.puredata.pd-l2ork.default.plist index 3c4d0d2fc..90c294358 100644 --- a/packages/darwin_app/org.puredata.pd-l2ork.default.plist +++ b/packages/darwin_app/org.puredata.pd-l2ork.default.plist @@ -73,13 +73,11 @@ <key>loadlib33</key> <string>pdp</string> <key>loadlib34</key> - <string>hexloader</string> - <key>loadlib35</key> <string>disis</string> - <key>loadlib36</key> + <key>loadlib35</key> <string>lyonpotpourri</string> <key>nloadlib</key> - <string>36</string> + <string>35</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 8f559a367..74d6891ad 100644 --- a/packages/linux_make/default.settings +++ b/packages/linux_make/default.settings @@ -33,10 +33,9 @@ loadlib29: ext13 loadlib30: ggee loadlib31: iem_anything loadlib32: ekext -loadlib33: hexloader -loadlib34: disis -loadlib35: lyonpotpourri -nloadlib: 35 +loadlib33: disis +loadlib34: lyonpotpourri +nloadlib: 34 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 f343538e3..6b6733c04 100755 --- a/packages/win32_inno/pd-inno.iss.in +++ b/packages/win32_inno/pd-inno.iss.in @@ -177,17 +177,14 @@ Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib31; Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib32; ValueData: ekext; Tasks: libs; Flags: uninsdeletekey Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib32; ValueData: ekext; Tasks: libs; Flags: uninsdeletekey -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ValueData: hexloader; Tasks: libs; Flags: uninsdeletekey -Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ValueData: hexloader; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ValueData: disis; Tasks: libs; Flags: uninsdeletekey +Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ValueData: disis; Tasks: libs; Flags: uninsdeletekey -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: disis; Tasks: libs; Flags: uninsdeletekey -Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: disis; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey +Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib35; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey -Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib35; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey - -Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey -Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey +Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey +Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey -- GitLab