Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 07:56:28 +09:00
parent aaf09bb4db 0abe0a51c3
commit cc3822141e
113 changed files with 1513 additions and 609 deletions
--- a/.travis/linux..install.sh
+++ b/.travis/linux..install.sh
@@ -2,7 +2,7 @@

 set -e

-PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev  libogg-dev
+PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev
 	libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
 	libgig-dev libsoundio-dev"
--- a/.travis/linux.win32.install.sh
+++ b/.travis/linux.win32.install.sh
@@ -12,7 +12,7 @@ MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x
 	mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
 	mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate
 	mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime
-	mingw32-x-libgig mingw32-x-libsoundio $MINGW_PACKAGES"
+	mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame $MINGW_PACKAGES"

 export MINGW_PACKAGES

--- a/.travis/linux.win64.install.sh
+++ b/.travis/linux.win64.install.sh
@@ -15,7 +15,7 @@ MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x
 	mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile
 	mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
 	mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
-	mingw64-x-libgig mingw64-x-libsoundio $MINGW_PACKAGES"
+	mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame $MINGW_PACKAGES"

 export MINGW_PACKAGES

--- a/.travis/osx..install.sh
+++ b/.travis/osx..install.sh
@@ -2,7 +2,7 @@

 set -e

-PACKAGES="cmake pkg-config fftw libogg libvorbis libsndfile libsamplerate jack sdl stk portaudio node fltk"
+PACKAGES="cmake pkg-config fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"

 if [ "$QT5" ]; then
 	PACKAGES="$PACKAGES qt@5.5"