From fa4951c15fe27249e761aee941215d882f486747 Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Wed, 24 Sep 2014 22:59:27 +0200
Subject: [PATCH] Conditionally compile ecube support with ECUBE_SUPPORT macro
---
Builds/VisualStudio2012/open-ephys.sln | 18 +++++++++++++-----
Source/Processors/DataThreads/EcubeThread.cpp | 2 +-
Source/Processors/DataThreads/EcubeThread.h | 8 +++++++-
Source/Processors/SourceNode.cpp | 2 +-
Source/UI/ProcessorList.cpp | 2 ++
5 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/Builds/VisualStudio2012/open-ephys.sln b/Builds/VisualStudio2012/open-ephys.sln
index 61074c0e0..520a8d855 100644
--- a/Builds/VisualStudio2012/open-ephys.sln
+++ b/Builds/VisualStudio2012/open-ephys.sln
@@ -1,21 +1,29 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
+ Debug|x64 = Debug|x64
+ Debug64|Win32 = Debug64|Win32
Debug64|x64 = Debug64|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Release64|Win32 = Release64|Win32
Release64|x64 = Release64|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
- {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
- {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
+ {9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
EndGlobalSection
diff --git a/Source/Processors/DataThreads/EcubeThread.cpp b/Source/Processors/DataThreads/EcubeThread.cpp
index f0b0b9563..93179c79c 100644
--- a/Source/Processors/DataThreads/EcubeThread.cpp
+++ b/Source/Processors/DataThreads/EcubeThread.cpp
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../../UI/EcubeDialogComponent.h"
#include <stdint.h>
-#if JUCE_WINDOWS
+#ifdef ECUBE_COMPILE
#import "libid:60C0AAC2-1E0B-4FE5-A921-AF9CEEAAA582"
using namespace ecubeapiLib;
diff --git a/Source/Processors/DataThreads/EcubeThread.h b/Source/Processors/DataThreads/EcubeThread.h
index 858c81db6..c2a1f56d4 100644
--- a/Source/Processors/DataThreads/EcubeThread.h
+++ b/Source/Processors/DataThreads/EcubeThread.h
@@ -40,6 +40,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
class SourceNode;
#if JUCE_WINDOWS
+#ifdef ECUBE_SUPPORT
+#define ECUBE_COMPILE
+#endif
+#endif
+
+#ifdef ECUBE_COMPILE
class EcubeDevInt;
#endif
@@ -48,7 +54,7 @@ class EcubeThread : public DataThread
{
public:
-#if JUCE_WINDOWS
+#ifdef ECUBE_COMPILE
EcubeThread(SourceNode* sn);
~EcubeThread();
diff --git a/Source/Processors/SourceNode.cpp b/Source/Processors/SourceNode.cpp
index 78a6e81fc..952516536 100755
--- a/Source/Processors/SourceNode.cpp
+++ b/Source/Processors/SourceNode.cpp
@@ -59,7 +59,7 @@ SourceNode::SourceNode(const String& name_)
{
dataThread = new RHD2000Thread(this);
}
-#if JUCE_WINDOWS
+#if ECUBE_COMPILE
else if (getName().equalsIgnoreCase("eCube"))
{
dataThread = new EcubeThread(this);
diff --git a/Source/UI/ProcessorList.cpp b/Source/UI/ProcessorList.cpp
index 28c2817e2..c32ea5c33 100755
--- a/Source/UI/ProcessorList.cpp
+++ b/Source/UI/ProcessorList.cpp
@@ -56,7 +56,9 @@ ProcessorList::ProcessorList()
//sources->addSubItem(new ProcessorListItem("Custom FPGA"));
sources->addSubItem(new ProcessorListItem("Rhythm FPGA"));
#if JUCE_WINDOWS // eCube module currently only available for Windows
+#ifdef ECUBE_SUPPORT
sources->addSubItem(new ProcessorListItem("eCube")); // Added by Michael Borisov
+#endif
#endif
sources->addSubItem(new ProcessorListItem("File Reader"));
//sources->addSubItem(new ProcessorListItem("Network Events"));
--
GitLab