Commit 15ac8a10 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'master' into handle-mingw64-correctly

parents 148ca8f4 f6a5677a

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -11,8 +11,9 @@ debian_stable_i386_deb:
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
......@@ -30,8 +31,29 @@ debian_stable_amd64_deb:
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
debian_stretch_amd64_deb:
tags:
- debian
- stretch
- amd64
script:
- echo "" | sudo -S apt-get -qq purge -y pd-l2ork > /dev/null || echo "couldn't purge..."
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y update > /dev/null
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive apt-get -qq -y upgrade > /dev/null
- cd l2ork_addons
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
......@@ -49,8 +71,10 @@ ubuntu_14.04_i386_deb:
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd
- cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
......@@ -68,8 +92,10 @@ ubuntu_14.04_amd64_deb:
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd
- cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
......@@ -87,8 +113,10 @@ ubuntu_16.04_amd64_deb:
- ./tar_em_up.sh -B
- cd ..
- echo "" | sudo -S DEBIAN_FRONTEND=noninteractive dpkg --force-all -i pd-l2ork*.deb > /dev/null
- pd-l2ork -nogui -nrt -noaudio scripts/load_all_binaries.pd
- cd scripts
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
......@@ -102,11 +130,13 @@ osx_amd64_dmg:
- echo `pwd`
- cd l2ork_addons
- ./tar_em_up.sh -X
- cd ../scripts
- ../packages/darwin_app/build/*.app/Contents/Resources/app.nw/bin/pd-l2ork -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- Pd*.dmg
osx_10.8_amd64_dmg:
tags:
- osx
......@@ -116,11 +146,30 @@ osx_10.8_amd64_dmg:
- echo `pwd`
- cd l2ork_addons
- osx_version=10.8 ./tar_em_up.sh -X
- cd ../scripts
- ../packages/darwin_app/build/*.app/Contents/Resources/app.nw/bin/pd-l2ork -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- Pd*.dmg
windows_i386_installer:
tags:
- windows
- i386
script:
- echo `pwd`
- cd l2ork_addons
- ./tar_em_up.sh -Z
- cd ../scripts
- ../packages/win32_inno/build/bin/pd.exe -noprefs -nostdpath -nogui -noaudio external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- Purr*.exe
debian_stable_arm_deb:
tags:
- debian
......@@ -130,20 +179,10 @@ debian_stable_arm_deb:
- echo `pwd`
- cd l2ork_addons
- ./tar_em_up.sh -r
- cd ..
- valgrind pd-l2ork -noprefs -nostdpath -nogui -nrt -noaudio scripts/external-tests.pd
artifacts:
name: "$CI_RUNNER_DESCRIPTION"
expire_in: 1 day
paths:
- pd*.deb
windows_i386_installer:
tags:
- windows
- i386
script:
- echo `pwd`
- cd l2ork_addons
- ./tar_em_up.sh -Z
artifacts:
expire_in: 1 day
paths:
- Purr*.exe
......@@ -15,4 +15,4 @@
url = https://git.purrdata.net/jwilkes/Gem.git
[submodule "externals/lyonpotpourri"]
path = externals/lyonpotpourri
url = https://github.com/ericlyon/lyonpotpourri3.0.git
url = https://git.purrdata.net/jwilkes/lyonpotpourri3.0.git
......@@ -81,7 +81,7 @@ Pd-L2ork has the following goals:
You can download a precompiled installer for Gnu/Linux, Windows, or OSX
from the following site:
[https://github.com/agraef/purr-data/releases](https://github.com/agraef/purr-data/releases)
[https://github.com/jonwwilkes/purr-data/releases](https://github.com/jonwwilkes/purr-data/releases)
### Build Guide
......@@ -219,6 +219,7 @@ that case, but I haven't tested doing it like that. Sorry. Get a better OS...)
mingw-w64-i686-ladspa-sdk mingw-w64-i686-lame \
mingw-w64-i686-libsndfile mingw-w64-i686-libvorbis \
mingw-w64-i686-lua mingw-w64-i686-toolchain \
mingw-w64-i686-libjpeg-turbo \
rsync unzip wget
5. Download the source code *(3-6 minutes)*
......
......@@ -81,7 +81,8 @@ deb: $(debsrc) $(addprefix debian/nwjs/, $(nwjs))
# This can be removed once Ubuntu 12.04 finally goes the way of the dodo.
# cd $(debdist) && patch -p1 < ../precise-configure.patch
# Patch the user config dir name so that purr-data can coexist with pd-l2ork.
cd $(debdist) && patch -Np1 < ../userconfig.patch
# Not needed with purr-data 2.4.5+ any more.
# cd $(debdist) && patch -Np1 < ../userconfig.patch
# Make sure to copy the Debian files which may have uncommitted changes.
# Then run debuild to create the package.
cd $(debdist) && cp -R ../debian . && debuild $(DEBUILD_FLAGS)
......
......@@ -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
......@@ -642,6 +642,9 @@ $(gem_src)/Gem.dll: $(gem_src)/configure
CXXFLAGS="-DHAVE_S_STUFF_H" \
--host=i686-w64-mingw32 \
--without-ALL \
--with-jpeg \
--with-jpeg-cflags="-I/mingw32/include" \
--with-jpeg-libs="-L/mingw32/lib -ljpeg" \
--with-ftgl \
--with-ftgl-cflags="-I/mingw32/include -I/mingw32/include/freetype2" \
--with-ftgl-libs="-L/mingw32/lib -lftgl" \
......@@ -937,7 +940,7 @@ iem16_install: iem16
install -d $(DESTDIR)$(objectsdir)/$(IEM16_NAME)
$(scripts_src)/generate-libdir-metafile.sh $(DESTDIR)$(objectsdir) $(IEM16_NAME) \
--author "IOhannes m zmoelnig" \
--description "16bit table, array objects for low memory usage" \
--description "16bit table/array objects for low memory usage" \
--license "GNU GPL" \
--version "0.1"
install -p $(IEM16_DIR)/*.$(EXTENSION) $(DESTDIR)$(objectsdir)/$(IEM16_NAME)
......@@ -1108,29 +1111,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:
......@@ -1857,26 +1837,26 @@ zexy_install: zexy
# add missing aliases
# can't do these on Windows because FAT, NTFS don't support these chars in filenames
# on Windows, these are faked in by loading them as libs
ifneq ($(OS_NAME),windows)
test -e $(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION) || \
ln -s 0x2e.$(EXTENSION) \
$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/..$(EXTENSION)
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)' || \
ln -s 0x260x260x7e.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/&&~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)' || \
ln -s 0x3c0x7e.$(EXTENSION) \
'$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/<~.$(EXTENSION)'
test -e '$(DESTDIR)$(objectsdir)/$(ZEXY_NAME)/==~.$(EXTENSION)' || \
ln -s 0x3d0x3d0x7e.$(EXTENSION) \