From 2f2f27ab0c2a84399a15d4e061840b90f6defd0d Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 01:21:54 +0100 Subject: [PATCH 1/7] Travis CI: Add win32 target os Temporarily disable Linux builds --- .travis.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ecb14fd55..28376a99b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,18 @@ language: cpp compiler: gcc -before_install: sudo apt-get update -install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev -before_script: mkdir build && cd build -script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8 VERBOSE=1 +env: +# - TARGET_OS=linux + - TARGET_OS=win32 +before_install: + - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi + - sudo apt-get update -qq +install: + - if [ $TARGET_OS != linux ]; then sudo apt-get install -y cloog-isl libmpc2 mingw32; fi + - if [ $TARGET_OS == win32 ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk 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; fi + - if [ $TARGET_OS == linux ]; then sudo apt-get install -y libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev; fi +before_script: + - mkdir build && cd build +script: + - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi + - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi + - make VERBOSE=1 From 4d6ac1f85d6cdc8a6621ff908be2175e9b5b3182 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 01:51:29 +0100 Subject: [PATCH 2/7] Fix compile errors --- include/lmms_math.h | 7 ++++++- src/core/fft_helpers.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/lmms_math.h b/include/lmms_math.h index 508ef6827..65a5a41ab 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -31,7 +31,12 @@ #include "lmmsconfig.h" #include -#include +#include +using namespace std; + +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif #if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) #ifndef isnanf diff --git a/src/core/fft_helpers.cpp b/src/core/fft_helpers.cpp index e1ebc648b..0f9444aa6 100644 --- a/src/core/fft_helpers.cpp +++ b/src/core/fft_helpers.cpp @@ -25,7 +25,7 @@ #include "fft_helpers.h" -#include +#include /* returns biggest value from abs_spectrum[spec_size] array From ee9b92ca819329a5fa931b2d1b523dc6fcc479ed Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 02:15:15 +0100 Subject: [PATCH 3/7] Travis: Enable multithreading, Linux, Win64 --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28376a99b..34a636525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,21 @@ language: cpp compiler: gcc env: -# - TARGET_OS=linux + - TARGET_OS=linux - TARGET_OS=win32 + - TARGET_OS=win64 before_install: - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi - sudo apt-get update -qq install: - if [ $TARGET_OS != linux ]; then sudo apt-get install -y cloog-isl libmpc2 mingw32; fi - if [ $TARGET_OS == win32 ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk 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; fi + - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk 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; fi - if [ $TARGET_OS == linux ]; then sudo apt-get install -y libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev; fi before_script: - mkdir build && cd build script: - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi + - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi - - make VERBOSE=1 + - make -j4 VERBOSE=1 From 60d10f2461e2f14a18d44d4154cc986a3b635017 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 02:23:29 +0100 Subject: [PATCH 4/7] Travis: No multithreading make for windows builds --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34a636525..0846b08ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,5 @@ before_script: script: - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi - - make -j4 VERBOSE=1 + - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j4 VERBOSE=1; fi + - if [ $TARGET_OS != linux ]; then make; fi From cc3b1f0aea68520f4026122fe0c60671e502f810 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 11:15:37 +0100 Subject: [PATCH 5/7] Fix win64 build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0846b08ac..3b0272969 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - sudo apt-get update -qq install: - if [ $TARGET_OS != linux ]; then sudo apt-get install -y cloog-isl libmpc2 mingw32; fi - - if [ $TARGET_OS == win32 ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk 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; fi + - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk 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; fi - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk 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; fi - if [ $TARGET_OS == linux ]; then sudo apt-get install -y libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev; fi before_script: From 564fb389980d2ad2b7ff34a07ad3b0313c91518d Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 14:51:20 +0100 Subject: [PATCH 6/7] Automatic deployment for Windows builds --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3b0272969..82aa2cab4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,3 +19,14 @@ script: - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j4 VERBOSE=1; fi - if [ $TARGET_OS != linux ]; then make; fi +before_deploy: make package +deploy: + provider: releases + api_key: + secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE= + file: lmms-*-win*.exe + on: + tags: true + all_branches: true + condition: "$TARGET_OS != linux" + repo: LMMS/lmms From 43189492d0a791ecbb11677c88366a7300e637b6 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 16 Nov 2014 15:01:15 +0100 Subject: [PATCH 7/7] Remove M_PI definition, use F_PI --- include/lmms_math.h | 4 ---- src/core/fft_helpers.cpp | 4 ++-- src/gui/widgets/knob.cpp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/lmms_math.h b/include/lmms_math.h index 65a5a41ab..ef0066125 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -34,10 +34,6 @@ #include using namespace std; -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif - #if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) #ifndef isnanf #define isnanf(x) isnan(x) diff --git a/src/core/fft_helpers.cpp b/src/core/fft_helpers.cpp index 0f9444aa6..71e84a8db 100644 --- a/src/core/fft_helpers.cpp +++ b/src/core/fft_helpers.cpp @@ -25,7 +25,7 @@ #include "fft_helpers.h" -#include +#include "lmms_math.h" /* returns biggest value from abs_spectrum[spec_size] array @@ -73,7 +73,7 @@ int hanming(float *timebuffer, int length, WINDOWS type) for ( i=0; i