Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Wynn
purr-data
Commits
74f43ce5
Commit
74f43ce5
authored
Mar 21, 2017
by
Jonathan Wilkes
Browse files
Merge branch 'aggraef/purr-data-lyonpotpourri-fixes'
parents
314c9fd7
311fc727
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitmodules
View file @
74f43ce5
...
...
@@ -10,9 +10,9 @@
[submodule "externals/fftease"]
path = externals/fftease
url = https://git.purrdata.net/jwilkes/fftease.git
[submodule "externals/lyonpotpourri"]
path = externals/lyonpotpourri
url = https://git.purrdata.net/jwilkes/lyonpotpourri.git
[submodule "Gem"]
path = Gem
url = https://git.purrdata.net/jwilkes/Gem.git
[submodule "externals/lyonpotpourri"]
path = externals/lyonpotpourri
url = https://github.com/ericlyon/lyonpotpourri3.0.git
externals/Makefile
View file @
74f43ce5
...
...
@@ -1163,16 +1163,28 @@ lyonpotpourri_install:
#make -C
$(externals_src)
/
$(LYON_SRC)
DESTDIR
=
"
$(DESTDIR)
"
\
# objectsdir="
$(objectsdir)
" install
install -d
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
install -d
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/sound
install -p
$(
wildcard
$(externals_src)
/
$(LYON_SRC)
/*.
$(EXTENSION)
)
\
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
install -p
$(externals_src)
/
$(LYON_SRC)
/
lyonpotpourri-helpfiles/
*.pd
\
install -p
$(externals_src)
/
$(LYON_SRC)
/*.pd
\
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
install -d
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/sound
install -p
$(externals_src)
/
$(LYON_SRC)
/examples/*.*
\
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/sound
# some of the help patches expect to find the sounds in the examples
# subfolder instead of 'sound', so make sure that both are available
ifeq
($(OS_NAME),windows)
# symbolic links don't work under Windows, just copy the folder instead
rm -rf
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/examples
cp -r
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/sound
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/examples
else
rm -f
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/examples
ln -sf sound
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/examples
endif
# don't include cartopol/poltocar-- cyclone library already has those
rm
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/cartopol*.
$(EXTENSION)
rm
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/poltocar*.
$(EXTENSION)
install -p
$(externals_src)
/
$(LYON_SRC)
/lyonpotpourri-helpfiles/sound/*.*
\
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/
soun
d
rm
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/cartopol*.pd
rm
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
/
poltocar*.p
d
# copy the meta file and the shared lib
install -p
$(externals_src)
/
$(LYON_SRC)
/*lyonpotpourri*.*
\
$(DESTDIR)$(objectsdir)
/
$(LYON_DEST)
...
...
lyonpotpourri
@
30afc272
Subproject commit
5e551b20cf8ac06aec762c573f365088b1903d2c
Subproject commit
30afc27214f58b671e7404021cadff3d0ddc362f
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment