Skip to content

Commit 8d5cdcd

Browse files
ethanbbethanbb
committed
Merge branch 'development' into dsp-common
2 parents e95eaec + 61687e9 commit 8d5cdcd

82 files changed

Lines changed: 3704 additions & 14403 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,36 @@ Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
120120
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
121121
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace
122122
Builds/MacOSX/build
123-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.mode1v3
124-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.pbxuser
125-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/xcuserdata
126-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/project.xcworkspace
123+
Projucer/Builds/MacOSX/Projucer.xcodeproj/*.mode1v3
124+
Projucer/Builds/MacOSX/Projucer.xcodeproj/*.pbxuser
125+
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
126+
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
127127
Projucer/Builds/MacOSX/build
128128
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
129129
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
130130

131+
*.pbxuser
132+
!default.pbxuser
133+
*.mode1v3
134+
!default.mode1v3
135+
*.mode2v3
136+
!default.mode2v3
137+
*.perspectivev3
138+
*default.perspectivev3
139+
xcuserdata/
140+
141+
*.moved-aside
142+
*.xccheckout
143+
*.xcscmblueprint
144+
145+
*.xcodeproj/*
146+
!*.xcodeproj/project.pbxproj
147+
!*.xcodeproj/xcshareddata/
148+
!*.xcworkspace/contents.xcworkspacedata
149+
/*.gcno
150+
151+
PluginGenerator/Builds/MacOSX/OpenEphys_PluginGenerator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
152+
131153
# 9. Plugin build dirs
132154
build/
133155

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
buildForAnalyzing = "YES">
132132
<BuildableReference
133133
BuildableIdentifier = "primary"
134-
BlueprintIdentifier = "038981D21FA2EFB500D25D7A"
134+
BlueprintIdentifier = "274EC0321FC30DB200242F92"
135135
BuildableName = "EvntTrigAvg.bundle"
136136
BlueprintName = "EvntTrigAvg"
137137
ReferencedContainer = "container:Plugins/EvntTrigAvg/EvntTrigAvg.xcodeproj">

‎Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@
173173
buildSettings = {
174174
HEADER_SEARCH_PATHS = (
175175
"$(inherited)",
176-
"$(MAC_PACKAGE_DIR)/include",
177176
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
177+
"$(MAC_PACKAGE_DIR)/include",
178178
);
179179
OTHER_LDFLAGS = (
180180
"$(inherited)",
181181
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
182-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5.a",
183-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5_cpp.a",
182+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
183+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
184184
);
185185
PRODUCT_NAME = "$(TARGET_NAME)";
186186
};
@@ -191,14 +191,14 @@
191191
buildSettings = {
192192
HEADER_SEARCH_PATHS = (
193193
"$(inherited)",
194-
"$(MAC_PACKAGE_DIR)/include",
195194
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
195+
"$(MAC_PACKAGE_DIR)/include",
196196
);
197197
OTHER_LDFLAGS = (
198198
"$(inherited)",
199199
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
200-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5.a",
201-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5_cpp.a",
200+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
201+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
202202
);
203203
PRODUCT_NAME = "$(TARGET_NAME)";
204204
};

‎Builds/MacOSX/Plugins/EvntTrigAvg/EvntTrigAvg.xcodeproj/project.pbxproj‎

Lines changed: 84 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
038C244D1FA389C4006EA927 /* EvntTrigAvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */; };
11-
038C244E1FA389C4006EA927 /* EvntTrigAvgCanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */; };
12-
038C244F1FA389C4006EA927 /* EvntTrigAvgEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */; };
13-
038C24501FA38A0F006EA927 /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */; };
10+
274EC05B1FC3203100242F92 /* EvntTrigAvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EC0511FC30EFE00242F92 /* EvntTrigAvg.cpp */; };
11+
274EC05C1FC3203400242F92 /* EvntTrigAvgCanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EC0521FC30EFE00242F92 /* EvntTrigAvgCanvas.cpp */; };
12+
274EC05D1FC3203800242F92 /* EvntTrigAvgEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EC0501FC30EFE00242F92 /* EvntTrigAvgEditor.cpp */; };
13+
274EC05E1FC3203B00242F92 /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 274EC0551FC30EFE00242F92 /* OpenEphysLib.cpp */; };
1414
/* End PBXBuildFile section */
1515

1616
/* Begin PBXFileReference section */
17-
038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvntTrigAvg.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
18-
038981D61FA2EFB500D25D7A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19-
038981DD1FA2F00200D25D7A /* EvntTrigAvg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvg.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.h; sourceTree = "<group>"; };
20-
038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvg.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.cpp; sourceTree = "<group>"; };
21-
038981DF1FA2F00200D25D7A /* EvntTrigAvgCanvas.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgCanvas.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.h; sourceTree = "<group>"; };
22-
038981E01FA2F00200D25D7A /* EvntTrigAvgEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgEditor.h; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.h; sourceTree = "<group>"; };
23-
038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/OpenEphysLib.cpp; sourceTree = "<group>"; };
24-
038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgEditor.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.cpp; sourceTree = "<group>"; };
25-
038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgCanvas.cpp; path = ../../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.cpp; sourceTree = "<group>"; };
26-
038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
27-
038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
17+
274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvntTrigAvg.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
18+
274EC0361FC30DB200242F92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19+
274EC04F1FC30EFE00242F92 /* EvntTrigAvgEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgEditor.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.h; sourceTree = "<group>"; };
20+
274EC0501FC30EFE00242F92 /* EvntTrigAvgEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgEditor.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgEditor.cpp; sourceTree = "<group>"; };
21+
274EC0511FC30EFE00242F92 /* EvntTrigAvg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvg.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.cpp; sourceTree = "<group>"; };
22+
274EC0521FC30EFE00242F92 /* EvntTrigAvgCanvas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EvntTrigAvgCanvas.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.cpp; sourceTree = "<group>"; };
23+
274EC0531FC30EFE00242F92 /* EvntTrigAvgCanvas.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvgCanvas.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.h; sourceTree = "<group>"; };
24+
274EC0541FC30EFE00242F92 /* EvntTrigAvg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EvntTrigAvg.h; path = ../../../../../Source/Plugins/EvntTrigAvg/EvntTrigAvg.h; sourceTree = "<group>"; };
25+
274EC0551FC30EFE00242F92 /* OpenEphysLib.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../../Source/Plugins/EvntTrigAvg/OpenEphysLib.cpp; sourceTree = "<group>"; };
26+
274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
27+
274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
2828
/* End PBXFileReference section */
2929

3030
/* Begin PBXFrameworksBuildPhase section */
31-
038981D01FA2EFB500D25D7A /* Frameworks */ = {
31+
274EC0301FC30DB200242F92 /* Frameworks */ = {
3232
isa = PBXFrameworksBuildPhase;
3333
buildActionMask = 2147483647;
3434
files = (
@@ -38,108 +38,109 @@
3838
/* End PBXFrameworksBuildPhase section */
3939

4040
/* Begin PBXGroup section */
41-
038981CA1FA2EFB500D25D7A = {
41+
274EC02A1FC30DB200242F92 = {
4242
isa = PBXGroup;
4343
children = (
44-
038981E41FA2F02500D25D7A /* Config */,
45-
038981D51FA2EFB500D25D7A /* EvntTrigAvg */,
46-
038981D41FA2EFB500D25D7A /* Products */,
44+
274EC0351FC30DB200242F92 /* EvntTrigAvg */,
45+
274EC0341FC30DB200242F92 /* Products */,
4746
);
4847
sourceTree = "<group>";
4948
};
50-
038981D41FA2EFB500D25D7A /* Products */ = {
49+
274EC0341FC30DB200242F92 /* Products */ = {
5150
isa = PBXGroup;
5251
children = (
53-
038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */,
52+
274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */,
5453
);
5554
name = Products;
5655
sourceTree = "<group>";
5756
};
58-
038981D51FA2EFB500D25D7A /* EvntTrigAvg */ = {
57+
274EC0351FC30DB200242F92 /* EvntTrigAvg */ = {
5958
isa = PBXGroup;
6059
children = (
61-
038981DC1FA2EFDA00D25D7A /* Source */,
62-
038981D61FA2EFB500D25D7A /* Info.plist */,
60+
274EC0581FC30F5900242F92 /* Config */,
61+
274EC04C1FC30E5D00242F92 /* Source */,
62+
274EC0361FC30DB200242F92 /* Info.plist */,
6363
);
6464
path = EvntTrigAvg;
6565
sourceTree = "<group>";
6666
};
67-
038981DC1FA2EFDA00D25D7A /* Source */ = {
67+
274EC04C1FC30E5D00242F92 /* Source */ = {
6868
isa = PBXGroup;
6969
children = (
70-
038981DE1FA2F00200D25D7A /* EvntTrigAvg.cpp */,
71-
038981DD1FA2F00200D25D7A /* EvntTrigAvg.h */,
72-
038981E31FA2F00300D25D7A /* EvntTrigAvgCanvas.cpp */,
73-
038981DF1FA2F00200D25D7A /* EvntTrigAvgCanvas.h */,
74-
038981E21FA2F00200D25D7A /* EvntTrigAvgEditor.cpp */,
75-
038981E01FA2F00200D25D7A /* EvntTrigAvgEditor.h */,
76-
038981E11FA2F00200D25D7A /* OpenEphysLib.cpp */,
70+
274EC0511FC30EFE00242F92 /* EvntTrigAvg.cpp */,
71+
274EC0541FC30EFE00242F92 /* EvntTrigAvg.h */,
72+
274EC0521FC30EFE00242F92 /* EvntTrigAvgCanvas.cpp */,
73+
274EC0531FC30EFE00242F92 /* EvntTrigAvgCanvas.h */,
74+
274EC0501FC30EFE00242F92 /* EvntTrigAvgEditor.cpp */,
75+
274EC04F1FC30EFE00242F92 /* EvntTrigAvgEditor.h */,
76+
274EC0551FC30EFE00242F92 /* OpenEphysLib.cpp */,
7777
);
78-
path = Source;
78+
name = Source;
7979
sourceTree = "<group>";
8080
};
81-
038981E41FA2F02500D25D7A /* Config */ = {
81+
274EC0581FC30F5900242F92 /* Config */ = {
8282
isa = PBXGroup;
8383
children = (
84-
038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */,
85-
038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */,
84+
274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */,
85+
274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */,
8686
);
87-
path = Config;
87+
name = Config;
8888
sourceTree = "<group>";
8989
};
9090
/* End PBXGroup section */
9191

9292
/* Begin PBXNativeTarget section */
93-
038981D21FA2EFB500D25D7A /* EvntTrigAvg */ = {
93+
274EC0321FC30DB200242F92 /* EvntTrigAvg */ = {
9494
isa = PBXNativeTarget;
95-
buildConfigurationList = 038981D91FA2EFB500D25D7A /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */;
95+
buildConfigurationList = 274EC0391FC30DB200242F92 /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */;
9696
buildPhases = (
97-
038981CF1FA2EFB500D25D7A /* Sources */,
98-
038981D01FA2EFB500D25D7A /* Frameworks */,
99-
038981D11FA2EFB500D25D7A /* Resources */,
97+
274EC02F1FC30DB200242F92 /* Sources */,
98+
274EC0301FC30DB200242F92 /* Frameworks */,
99+
274EC0311FC30DB200242F92 /* Resources */,
100100
);
101101
buildRules = (
102102
);
103103
dependencies = (
104104
);
105105
name = EvntTrigAvg;
106106
productName = EvntTrigAvg;
107-
productReference = 038981D31FA2EFB500D25D7A /* EvntTrigAvg.bundle */;
107+
productReference = 274EC0331FC30DB200242F92 /* EvntTrigAvg.bundle */;
108108
productType = "com.apple.product-type.bundle";
109109
};
110110
/* End PBXNativeTarget section */
111111

112112
/* Begin PBXProject section */
113-
038981CB1FA2EFB500D25D7A /* Project object */ = {
113+
274EC02B1FC30DB200242F92 /* Project object */ = {
114114
isa = PBXProject;
115115
attributes = {
116-
LastUpgradeCheck = 0900;
116+
LastUpgradeCheck = 0910;
117117
ORGANIZATIONNAME = "Open Ephys";
118118
TargetAttributes = {
119-
038981D21FA2EFB500D25D7A = {
120-
CreatedOnToolsVersion = 9.0.1;
119+
274EC0321FC30DB200242F92 = {
120+
CreatedOnToolsVersion = 9.1;
121+
ProvisioningStyle = Automatic;
121122
};
122123
};
123124
};
124-
buildConfigurationList = 038981CE1FA2EFB500D25D7A /* Build configuration list for PBXProject "EvntTrigAvg" */;
125+
buildConfigurationList = 274EC02E1FC30DB200242F92 /* Build configuration list for PBXProject "EvntTrigAvg" */;
125126
compatibilityVersion = "Xcode 8.0";
126127
developmentRegion = en;
127128
hasScannedForEncodings = 0;
128129
knownRegions = (
129130
en,
130131
);
131-
mainGroup = 038981CA1FA2EFB500D25D7A;
132-
productRefGroup = 038981D41FA2EFB500D25D7A /* Products */;
132+
mainGroup = 274EC02A1FC30DB200242F92;
133+
productRefGroup = 274EC0341FC30DB200242F92 /* Products */;
133134
projectDirPath = "";
134135
projectRoot = "";
135136
targets = (
136-
038981D21FA2EFB500D25D7A /* EvntTrigAvg */,
137+
274EC0321FC30DB200242F92 /* EvntTrigAvg */,
137138
);
138139
};
139140
/* End PBXProject section */
140141

141142
/* Begin PBXResourcesBuildPhase section */
142-
038981D11FA2EFB500D25D7A /* Resources */ = {
143+
274EC0311FC30DB200242F92 /* Resources */ = {
143144
isa = PBXResourcesBuildPhase;
144145
buildActionMask = 2147483647;
145146
files = (
@@ -149,74 +150,84 @@
149150
/* End PBXResourcesBuildPhase section */
150151

151152
/* Begin PBXSourcesBuildPhase section */
152-
038981CF1FA2EFB500D25D7A /* Sources */ = {
153+
274EC02F1FC30DB200242F92 /* Sources */ = {
153154
isa = PBXSourcesBuildPhase;
154155
buildActionMask = 2147483647;
155156
files = (
156-
038C24501FA38A0F006EA927 /* OpenEphysLib.cpp in Sources */,
157-
038C244D1FA389C4006EA927 /* EvntTrigAvg.cpp in Sources */,
158-
038C244E1FA389C4006EA927 /* EvntTrigAvgCanvas.cpp in Sources */,
159-
038C244F1FA389C4006EA927 /* EvntTrigAvgEditor.cpp in Sources */,
157+
274EC05B1FC3203100242F92 /* EvntTrigAvg.cpp in Sources */,
158+
274EC05D1FC3203800242F92 /* EvntTrigAvgEditor.cpp in Sources */,
159+
274EC05C1FC3203400242F92 /* EvntTrigAvgCanvas.cpp in Sources */,
160+
274EC05E1FC3203B00242F92 /* OpenEphysLib.cpp in Sources */,
160161
);
161162
runOnlyForDeploymentPostprocessing = 0;
162163
};
163164
/* End PBXSourcesBuildPhase section */
164165

165166
/* Begin XCBuildConfiguration section */
166-
038981D71FA2EFB500D25D7A /* Debug */ = {
167+
274EC0371FC30DB200242F92 /* Debug */ = {
167168
isa = XCBuildConfiguration;
168-
baseConfigurationReference = 038981E61FA2F04100D25D7A /* Plugin_Debug.xcconfig */;
169+
baseConfigurationReference = 274EC0591FC3105100242F92 /* Plugin_Debug.xcconfig */;
169170
buildSettings = {
170171
};
171172
name = Debug;
172173
};
173-
038981D81FA2EFB500D25D7A /* Release */ = {
174+
274EC0381FC30DB200242F92 /* Release */ = {
174175
isa = XCBuildConfiguration;
175-
baseConfigurationReference = 038981E51FA2F04100D25D7A /* Plugin_Release.xcconfig */;
176+
baseConfigurationReference = 274EC05A1FC3105100242F92 /* Plugin_Release.xcconfig */;
176177
buildSettings = {
177178
};
178179
name = Release;
179180
};
180-
038981DA1FA2EFB500D25D7A /* Debug */ = {
181+
274EC03A1FC30DB200242F92 /* Debug */ = {
181182
isa = XCBuildConfiguration;
182183
buildSettings = {
184+
CODE_SIGN_STYLE = Automatic;
185+
COMBINE_HIDPI_IMAGES = YES;
183186
INFOPLIST_FILE = EvntTrigAvg/Info.plist;
184-
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.EvntTrigAvg";
187+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
188+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.EvntTrigAvg;
185189
PRODUCT_NAME = "$(TARGET_NAME)";
190+
SKIP_INSTALL = YES;
191+
WRAPPER_EXTENSION = bundle;
186192
};
187193
name = Debug;
188194
};
189-
038981DB1FA2EFB500D25D7A /* Release */ = {
195+
274EC03B1FC30DB200242F92 /* Release */ = {
190196
isa = XCBuildConfiguration;
191197
buildSettings = {
198+
CODE_SIGN_STYLE = Automatic;
199+
COMBINE_HIDPI_IMAGES = YES;
192200
INFOPLIST_FILE = EvntTrigAvg/Info.plist;
193-
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.EvntTrigAvg";
201+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
202+
PRODUCT_BUNDLE_IDENTIFIER = com.openephys.EvntTrigAvg;
194203
PRODUCT_NAME = "$(TARGET_NAME)";
204+
SKIP_INSTALL = YES;
205+
WRAPPER_EXTENSION = bundle;
195206
};
196207
name = Release;
197208
};
198209
/* End XCBuildConfiguration section */
199210

200211
/* Begin XCConfigurationList section */
201-
038981CE1FA2EFB500D25D7A /* Build configuration list for PBXProject "EvntTrigAvg" */ = {
212+
274EC02E1FC30DB200242F92 /* Build configuration list for PBXProject "EvntTrigAvg" */ = {
202213
isa = XCConfigurationList;
203214
buildConfigurations = (
204-
038981D71FA2EFB500D25D7A /* Debug */,
205-
038981D81FA2EFB500D25D7A /* Release */,
215+
274EC0371FC30DB200242F92 /* Debug */,
216+
274EC0381FC30DB200242F92 /* Release */,
206217
);
207218
defaultConfigurationIsVisible = 0;
208219
defaultConfigurationName = Release;
209220
};
210-
038981D91FA2EFB500D25D7A /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */ = {
221+
274EC0391FC30DB200242F92 /* Build configuration list for PBXNativeTarget "EvntTrigAvg" */ = {
211222
isa = XCConfigurationList;
212223
buildConfigurations = (
213-
038981DA1FA2EFB500D25D7A /* Debug */,
214-
038981DB1FA2EFB500D25D7A /* Release */,
224+
274EC03A1FC30DB200242F92 /* Debug */,
225+
274EC03B1FC30DB200242F92 /* Release */,
215226
);
216227
defaultConfigurationIsVisible = 0;
217228
defaultConfigurationName = Release;
218229
};
219230
/* End XCConfigurationList section */
220231
};
221-
rootObject = 038981CB1FA2EFB500D25D7A /* Project object */;
232+
rootObject = 274EC02B1FC30DB200242F92 /* Project object */;
222233
}

‎Builds/MacOSX/open-ephys.xcodeproj/xcshareddata/xcschemes/open-ephys (App).xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
buildConfiguration = "Debug"
4646
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4747
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
language = ""
4849
shouldUseLaunchSchemeArgsEnv = "YES">
4950
<Testables>
5051
</Testables>
@@ -64,6 +65,7 @@
6465
buildConfiguration = "Debug"
6566
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6667
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
68+
language = ""
6769
launchStyle = "0"
6870
useCustomWorkingDirectory = "NO"
6971
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)