diff options
| -rw-r--r-- | externals/Makefile | 16 | ||||
| -rw-r--r-- | packages/darwin_app/org.puredata.pdextended.default.plist | 4 | ||||
| -rw-r--r-- | packages/linux_make/default.pdextended | 5 | ||||
| -rw-r--r-- | packages/win32_inno/pd-extended.bat | 2 | ||||
| -rwxr-xr-x | packages/win32_inno/pd-inno.iss.in | 4 | ||||
| -rwxr-xr-x | packages/win32_inno/pd-settings.reg | 4 | ||||
| -rwxr-xr-x | scripts/generate-pd-settings-files.sh | 2 |
7 files changed, 27 insertions, 10 deletions
diff --git a/externals/Makefile b/externals/Makefile index 4ae6048f..2cd75df1 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -125,7 +125,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 bassemu boids bsaylor comport creb cw_binaural cxc cyclone earplug ekext ext13 extra flatgui 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 loaders-pdlua loaders-tclpd log mapping markex maxlib mediasettings mjlib moocow moonlib motex mrpeach osc oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vanilla vbap windowing zexy +LIB_TARGETS = adaptive arraysize bassemu boids bsaylor chaos comport creb cw_binaural cxc cyclone earplug ekext ext13 extra flatgui 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 loaders-pdlua loaders-tclpd log mapping markex maxlib mediasettings mjlib moocow moonlib motex mrpeach osc oscx pan pdcontainer pddp pdogg plugin pmpd sigpack smlib tof unauthorized vanilla vbap windowing zexy # this is for libraries that don't compile (yet) on all platforms ifeq ($(OS_NAME),windows) @@ -319,6 +319,20 @@ bsaylor_clean: #------------------------------------------------------------------------------# +# CHAOS +chaos: + make -C $(externals_src)/chaos CFLAGS="$(CFLAGS)" \ + PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src + +chaos_install: + make -C $(externals_src)/chaos \ + DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install + +chaos_clean: + make -C $(externals_src)/chaos clean + + +#------------------------------------------------------------------------------# # COMPORT comport: make -C $(externals_src)/iem/comport/comport PD_PATH=$(pd_src) CFLAGS="$(CFLAGS)" 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"=- diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh index 4462e485..02a547e6 100755 --- a/scripts/generate-pd-settings-files.sh +++ b/scripts/generate-pd-settings-files.sh @@ -1,7 +1,7 @@ #!/bin/sh ECHO=/sw/bin/echo -LIBS="Gem cyclone zexy creb cxc iemlib list-abs mapping markex maxlib mjlib motex oscx pddp pdogg pmpd sigpack smlib unauthorized pan hcs jmmmp ext13 ggee iem_anything ekext flatgui pdp" +LIBS="Gem cyclone zexy creb cxc iemlib list-abs mapping markex maxlib mjlib motex oscx pddp pdogg pmpd sigpack smlib unauthorized pan hcs jmmmp ext13 ggee iem_anything ekext flatgui chaos pdp" GNULINUX_FONTPATH="/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/lib/fonts" |