Commit df891b40 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Add missing dlls to Windows installer, add dynamic lib extensions for Windows...

Add missing dlls to Windows installer, add dynamic lib extensions for Windows and OSX to scripts/load_all_binaries.pd
parent 859b486a
......@@ -1183,19 +1183,18 @@ lyonpotpourri_install:
#make -C $(externals_src)/$(LYON_NAME) DESTDIR="$(DESTDIR)" \
# objectsdir="$(objectsdir)" install
install -d $(DESTDIR)$(objectsdir)/$(LYON_NAME)
install -d $(DESTDIR)$(objectsdir)/$(LYON_NAME)/sound
install -p $(wildcard $(externals_src)/$(LYON_NAME)/*.$(EXTENSION)) \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
install -p $(externals_src)/$(LYON_NAME)/*.pd \
install -p $(externals_src)/$(LYON_NAME)/lyonpotpourri-helpfiles/*.pd \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
# don't include cartopol/poltocar-- cyclone library already has those
rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol*.pd
rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar*.pd
rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/cartopol*.$(EXTENSION)
rm $(DESTDIR)$(objectsdir)/$(LYON_NAME)/poltocar*.$(EXTENSION)
install -p $(externals_src)/$(LYON_NAME)/sound/*.* \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
install -p $(externals_src)/$(LYON_NAME)/lyonpotpourri-helpfiles/sound/*.* \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)/sound
# copy the meta file and the shared lib
install -p $(externals_src)/$(LYON_NAME)/*lyonpotpourri* \
install -p $(externals_src)/$(LYON_NAME)/*lyonpotpourri.* \
$(DESTDIR)$(objectsdir)/$(LYON_NAME)
# license and readme
install -p $(externals_src)/$(LYON_NAME)/*.txt \
......
......@@ -89,9 +89,17 @@ lib_install:
install -p $(bin_src)/libvorbis-0.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libvorbisenc-2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libvorbisfile-3.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libmp3lame-0.dll $(DESTDIR)$(bindir)/
# I think these two are needed for zexy/matchbox and zexy/regex
install -p $(bin_src)/libsystre-0.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libtre-5.dll $(DESTDIR)$(bindir)/
# For fluid~
install -p $(bin_src)/libfluidsynth-1.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libdl-0.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libportaudio-2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libFLAC-8.dll $(DESTDIR)$(bindir)/
# These are for Gem
install -p $(bin_src)/libftgl-2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libfreetype-6.dll $(DESTDIR)$(bindir)/
......@@ -110,6 +118,12 @@ lib_install:
install -p $(bin_src)/libwinpthread-1.dll $(DESTDIR)$(bindir)
install -p $(bin_src)/libgcc_s_dw2-1.dll $(DESTDIR)$(bindir)
install -p $(bin_src)/libstdc++-6.dll $(DESTDIR)$(bindir)
# lyonpotpourri compiles its own shared lib. On Windows it needs to be
# in the path of the pd executable in order to get loaded. (There's probably
# also a way to add the external lib's path but I don't know how to do that.)
install -p $(DESTDIR)/extra/lyonpotpourri/liblyonpotpourri.dll $(DESTDIR)$(bindir)
# fftease also uses a shared lib...
install -p $(DESTDIR)/extra/fftease/libfftease.dll $(DESTDIR)$(bindir)
exe_install:
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment