Merge pull request #41 from Musicoll/dev/master

merge dev/master into master (wip-beta 0.0.3)

.gitignore

@@ -1,41 +1,4 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# XCode & Mac
-.DS_Store
-DerivedData/
-xcuserdata/
-*.build/
-*.pbxuser
-*.xcuserdata
-*.xcuserdatad
-*.xcscmblueprint
-
-# CMake
-CMakeFiles/
-CMakeCache.txt
-cmake_install.cmake
-Makefile
-
 # Project specific
 Build/
-config/html/
+Config/html/
+ThirdParty/flip-public/

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "ThirdParty/Juce"]
 	path = ThirdParty/Juce
 	url = https://github.com/julianstorer/JUCE.git
-[submodule "ThirdParty/flip-public"]
-	path = ThirdParty/flip-public
-	url = https://github.com/ohmtech/flip-public.git
 [submodule "ThirdParty/flip"]
 	path = ThirdParty/flip
-url=https://github.com/ohmtech/flip.git
+	url = git@github.com:ohmtech/flip.git

.travis.yml

@@ -9,16 +9,26 @@ git:
   submodules: false
 
 install:
-    - git submodule update --init --recursive ThirdParty/flip-public
     - git submodule update --init --recursive ThirdParty/Juce
 
 matrix:
   include:
   - os: linux
-    compiler: gcc
+    compiler: g++
     env: COMPILER=g++-4.9
+    before_install:
+    - sudo apt-get update
+    - sudo apt-get install libfreetype6-dev
+    - sudo apt-get install libx11-dev
+    - sudo apt-get install libxrandr-dev
+    - sudo apt-get install libxinerama1
+    - sudo apt-get install libxinerama-dev
+    - sudo apt-get install libxcursor-dev
+    - sudo apt-get install libasound2-dev
     script:
-    - ls
+    - python ./Config/configure.py
+    - python ./Config/build.py -c Release
+    - python ./Config/run_test.py -c Release
     after_success:
     - openssl aes-256-cbc -K $encrypted_5a43ff9033eb_key -iv $encrypted_5a43ff9033eb_iv -in Config/travisci_rsa.enc -out Config/travisci_rsa -d
     - chmod 0600 Config/travisci_rsa
@@ -29,14 +39,15 @@ matrix:
   - os: osx
     compiler: clang++
     env: COMPILER=clang++
+    before_install:
+      - brew install portaudio
     script:
     - python ./Config/configure.py
     - python ./Config/build.py -c Release
     - python ./Config/run_test.py -c Release
     before_deploy:
     - mkdir Kiwi
     - mv Build/Release/KiwiBuild/Bin/Release/Kiwi.app Kiwi/Kiwi.app
-    - mv Build/Release/KiwiBuild/Bin/Release/Server Kiwi/Server
     - zip -r Kiwi_macos.zip Kiwi
     deploy:
       provider: releases