Skip to content

Commit 25fc4c5

Browse files
authored
Merge pull request #296 from tne-lab/dsp-plugin-api
Use DSP library from main GUI instead of a common library plugin
2 parents 9ad08a5 + f3ddc0b commit 25fc4c5

66 files changed

Lines changed: 112 additions & 11438 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Builds/MacOSX/Plugins/CommonLibs/DspLib/DspLib.xcodeproj/project.pbxproj

Lines changed: 0 additions & 443 deletions
This file was deleted.

Builds/MacOSX/Plugins/FilterNode/FilterNode.xcodeproj/project.pbxproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
277C42AE202CC33D00A9FFD6 /* libDspLib.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 277C42AF202CC33D00A9FFD6 /* libDspLib.dylib */; };
1110
E1F558C31C9B20070035F88B /* FilterEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F558AC1C9B20070035F88B /* FilterEditor.cpp */; };
1211
E1F558C41C9B20070035F88B /* FilterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F558AE1C9B20070035F88B /* FilterNode.cpp */; };
1312
E1F558C61C9B20070035F88B /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F558B11C9B20070035F88B /* OpenEphysLib.cpp */; };
1413
/* End PBXBuildFile section */
1514

1615
/* Begin PBXFileReference section */
17-
277C42AF202CC33D00A9FFD6 /* libDspLib.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libDspLib.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
1816
E1F558751C9B1F920035F88B /* FilterNode.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FilterNode.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1917
E1F558781C9B1F920035F88B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2018
E1F558801C9B1FDC0035F88B /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin_Debug.xcconfig; sourceTree = "<group>"; };
@@ -31,28 +29,18 @@
3129
isa = PBXFrameworksBuildPhase;
3230
buildActionMask = 2147483647;
3331
files = (
34-
277C42AE202CC33D00A9FFD6 /* libDspLib.dylib in Frameworks */,
3532
);
3633
runOnlyForDeploymentPostprocessing = 0;
3734
};
3835
/* End PBXFrameworksBuildPhase section */
3936

4037
/* Begin PBXGroup section */
41-
277C42AD202CC33D00A9FFD6 /* Frameworks */ = {
42-
isa = PBXGroup;
43-
children = (
44-
277C42AF202CC33D00A9FFD6 /* libDspLib.dylib */,
45-
);
46-
name = Frameworks;
47-
sourceTree = "<group>";
48-
};
4938
E1F5586C1C9B1F920035F88B = {
5039
isa = PBXGroup;
5140
children = (
5241
E1F5587E1C9B1FDC0035F88B /* Config */,
5342
E1F558771C9B1F920035F88B /* FilterNode */,
5443
E1F558761C9B1F920035F88B /* Products */,
55-
277C42AD202CC33D00A9FFD6 /* Frameworks */,
5644
);
5745
sourceTree = "<group>";
5846
};
@@ -189,7 +177,6 @@
189177
isa = XCBuildConfiguration;
190178
buildSettings = {
191179
INFOPLIST_FILE = FilterNode/Info.plist;
192-
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/../Frameworks";
193180
PRODUCT_BUNDLE_IDENTIFIER = "org.open-ephys.gui.plugin.FilterNode";
194181
PRODUCT_NAME = "$(TARGET_NAME)";
195182
};
@@ -199,7 +186,6 @@
199186
isa = XCBuildConfiguration;
200187
buildSettings = {
201188
INFOPLIST_FILE = FilterNode/Info.plist;
202-
LIBRARY_SEARCH_PATHS = "$(CONFIGURATION_BUILD_DIR)/../Frameworks";
203189
PRODUCT_BUNDLE_IDENTIFIER = "org.open-ephys.gui.plugin.FilterNode";
204190
PRODUCT_NAME = "$(TARGET_NAME)";
205191
};

Builds/VisualStudio2013/Plugins/CommonLibs/DspLib/DspLib.vcxproj

Lines changed: 0 additions & 168 deletions
This file was deleted.

Builds/VisualStudio2013/Plugins/CommonLibs/DspLib/DspLib.vcxproj.filters

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)