Merge pull request #92 from pierreguillot/dev/v1.0.3

v1.0.3

.gitignore

@@ -35,9 +35,11 @@
 *.xcuserdatad
 
 # Juce & ThirdParty
-/Builds/MacOSX/build/
-/Builds/LinuxMakefile/build/
-/Builds/.backup/
+/Instrument/Builds/MacOSX/build/
+/Instrument/Builds/LinuxMakefile/build/
+/Effect/Builds/MacOSX/build/
+/Effect/Builds/LinuxMakefile/build/
+/.backup/
 
 #Examples
 /Plugins/Examples/*

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "Juce"]
 	path = Juce
-	url = https://pierreguillot@github.com/WeAreROLI/JUCE.git
-[submodule "VST"]
-	path = VST
-	url = https://pierreguillot@github.com/steinbergmedia/vst3sdk.git
-[submodule "libpd"]
-	path = libpd
-	url = https://github.com/pierreguillot/libpd.git
-[submodule "readerwriterqueue"]
-	path = readerwriterqueue
-	url = https://github.com/cameron314/readerwriterqueue.git
-[submodule "concurrentqueue"]
-	path = concurrentqueue
-	url = https://github.com/cameron314/concurrentqueue.git
+url=https://github.com/pierreguillot/JUCE.git
+[submodule "Dependencies/ConcurrentQueue"]
+	path = Dependencies/ConcurrentQueue
+	url = https://github.com/pierreguillot/concurrentqueue.git
+[submodule "Dependencies/ReaderwriterQueue"]
+	path = Dependencies/ReaderwriterQueue
+	url = https://github.com/pierreguillot/readerwriterqueue.git
+[submodule "Dependencies/Vst"]
+	path = Dependencies/Vst
+	url = https://github.com/steinbergmedia/vst3sdk.git
+[submodule "Dependencies/LibPd"]
+	path = Dependencies/LibPd
+	url = https://pierreguillot@github.com/pierreguillot/libpd.git

.travis.yml

@@ -19,9 +19,12 @@ matrix:
     - sudo apt-get -qq update
     - sudo apt-get install -y libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
     script:
-    - make -C libpd MULTI=true
-    - make -C Builds/LinuxMakefile/ TARGET_ARCH=-m64 CONFIG=Release
-    - make -C Builds/LinuxMakefile/ TARGET_ARCH=-m64 CONFIG=ReleaseFx
+    - mkdir Dependencies/LibPd/build && mkdir Dependencies/LibPd/build/makefile/ && cd Dependencies/LibPd/build/makefile
+    - cmake -DCMAKE_BUILD_TYPE=Release ../..
+    - cd ../../../..
+    - make -C Dependencies/LibPd/build/makefile libpdstatic
+    - make -C Instrument/Builds/LinuxMakefile TARGET_ARCH=-m64 CONFIG=Release
+    - make -C Effect/Builds/LinuxMakefile TARGET_ARCH=-m64 CONFIG=Release
     before_deploy:
     - rm Plugins/Camomile.a
     - rm Plugins/CamomileFx.a
@@ -36,9 +39,10 @@ matrix:
     compiler: clang++
     env: release=CamomileMacOS
     script:
-    - xcodebuild -project libpd/libpd.xcodeproj -target libpd-osx-multi -configuration Release ONLY_ACTIVE_ARCH=NO CONFIGURATION_BUILD_DIR="./libs" | egrep -A 5 "(error|warning):"
-    - xcodebuild -project Builds/MacOSX/Camomile.xcodeproj -configuration Release
-    - xcodebuild -project Builds/MacOSX/Camomile.xcodeproj -configuration ReleaseFx
+    - mkdir Dependencies/LibPd/build && mkdir Dependencies/LibPd/build/xcode/ && cd Dependencies/LibPd/build/xcode
+    - cmake -GXcode ../..
+    - cd ../../../..
+    - xcodebuild -workspace Camomile.xcworkspace -scheme Camomile-libpd -configuration Release
     before_deploy:
     - rm Plugins/libCamomile.a
     - rm Plugins/libCamomileFx.a