From 5ec38cf2af74697aa131d3077c207abeb553620c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Zbyszy=C5=84ski?= <m.zbyszynski@gold.ac.uk>
Date: Wed, 4 Oct 2017 11:24:40 +0100
Subject: [PATCH] working on JUCE example
---
dependencies/RapidLib | 2 +-
src/machineLearning/trainingData.h | 2 +-
src/rapidmix.h | 6 +++---
tests/test_project.xcodeproj/project.pbxproj | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dependencies/RapidLib b/dependencies/RapidLib
index 9c0902d..5e0190d 160000
--- a/dependencies/RapidLib
+++ b/dependencies/RapidLib
@@ -1 +1 @@
-Subproject commit 9c0902d41c767bb28386463435c805a62fed525e
+Subproject commit 5e0190d65d2204ad2fae48a5120b8c2191c7d106
diff --git a/src/machineLearning/trainingData.h b/src/machineLearning/trainingData.h
index 2d09904..7ff97b4 100644
--- a/src/machineLearning/trainingData.h
+++ b/src/machineLearning/trainingData.h
@@ -57,7 +57,7 @@ namespace rapidmix {
//TODO: Deleting phrases (last or by label)
//Design ideas to make phrase building stateless:
- std::vector<phrase>::iterator createNewPhrase();
+ std::vector<phrase>::iterator createNewPhrase(); //??? Do we need this?
std::vector<phrase>::iterator createNewPhrase(std::string label);
/** Create a new phrase that can be recorded into. Returns phrase id */
diff --git a/src/rapidmix.h b/src/rapidmix.h
index 4afa45f..fa3e13e 100644
--- a/src/rapidmix.h
+++ b/src/rapidmix.h
@@ -41,8 +41,8 @@
#define RAPIDMIX_VERSION "2.2.0"
#define RAPIDMIX_REVISION "27-SEPTEMBER-2017"
-#include "machineLearning.h"
-#include "trainingData.h"
-#include "signalProcessing.h"
+#include "machineLearning/machineLearning.h"
+#include "machineLearning/trainingData.h"
+#include "signalProcessing/signalProcessing.h"
#endif
diff --git a/tests/test_project.xcodeproj/project.pbxproj b/tests/test_project.xcodeproj/project.pbxproj
index d15866e..0c5ee8b 100644
--- a/tests/test_project.xcodeproj/project.pbxproj
+++ b/tests/test_project.xcodeproj/project.pbxproj
@@ -1283,6 +1283,7 @@
0BFFEF2B1E56083D00EF19A5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_C_LANGUAGE_STANDARD = c11;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1291,6 +1292,7 @@
0BFFEF2C1E56083D00EF19A5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_C_LANGUAGE_STANDARD = c11;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_NAME = "$(TARGET_NAME)";
};
--
GitLab