Skip to content

Commit a261156

Browse files
aacuevasaacuevas
committed
Fix some compilation errors on Mac
1 parent 48a6c65 commit a261156

18 files changed

Lines changed: 24 additions & 16 deletions

File tree

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,7 @@
11251125
DCA17BBB4FC31AAE9DC34DE9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileFilter.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileFilter.cpp"; sourceTree = "SOURCE_ROOT"; };
11261126
DCF6696CA1463CD8557E1FFE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
11271127
DD5695DE97CEF7BE76869232 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileOutputStream.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileOutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
1128+
DDD708C7DBA729D2550B40BF = {isa = PBXFileReference; lastKnownFileType = "file.h~"; name = "juce_StandardHeader.h~"; path = "../../JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h~"; sourceTree = "SOURCE_ROOT"; };
11281129
DDE157BB06373ECDBB23469C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutManager.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h"; sourceTree = "SOURCE_ROOT"; };
11291130
DDE89F0D5E01F079323CC89C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorPlayer.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h"; sourceTree = "SOURCE_ROOT"; };
11301131
DE4861552DB1976665B25DFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1924,6 +1925,7 @@
19241925
9D740F320C13F9B82EB64461 = {isa = PBXGroup; children = (
19251926
7F17077973FFDD70C4B78E7E,
19261927
A5E8E0CF6DA1AEAEE9D872DE,
1928+
DDD708C7DBA729D2550B40BF,
19271929
9978BC2A359BC506F69E545F,
19281930
DB4F34DA0F04B40EB6A50FB1,
19291931
C446923C1950EB5BE5E67F15, ); name = system; sourceTree = "<group>"; };
@@ -2669,7 +2671,6 @@
26692671
GCC_PREPROCESSOR_DEFINITIONS = (
26702672
"_DEBUG=1",
26712673
"DEBUG=1",
2672-
"JUCE_API=__attribute__((visibility(\"default\")))",
26732674
"JUCER_XCODE_MAC_F6D2F4CF=1",
26742675
"JUCE_APP_VERSION=0.3.5",
26752676
"JUCE_APP_VERSION_HEX=0x305", );
@@ -2693,7 +2694,6 @@
26932694
GCC_PREPROCESSOR_DEFINITIONS = (
26942695
"_NDEBUG=1",
26952696
"NDEBUG=1",
2696-
"JUCE_API=__attribute__((visibility(\"default\")))",
26972697
"JUCER_XCODE_MAC_F6D2F4CF=1",
26982698
"JUCE_APP_VERSION=0.3.5",
26992699
"JUCE_APP_VERSION_HEX=0x305", );

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,6 +2062,7 @@
20622062
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20632063
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20642064
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2065+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20652066
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20662067
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20672068
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3668,6 +3668,9 @@
36683668
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36693669
<Filter>Juce Modules\juce_audio_utils</Filter>
36703670
</None>
3671+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3672+
<Filter>Juce Modules\juce_core\system</Filter>
3673+
</None>
36713674
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36723675
<Filter>Juce Modules\juce_core</Filter>
36733676
</None>

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,7 @@
20662066
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20672067
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20682068
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2069+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20692070
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20702071
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20712072
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3668,6 +3668,9 @@
36683668
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36693669
<Filter>Juce Modules\juce_audio_utils</Filter>
36703670
</None>
3671+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3672+
<Filter>Juce Modules\juce_core\system</Filter>
3673+
</None>
36713674
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36723675
<Filter>Juce Modules\juce_core</Filter>
36733676
</None>

‎Source/Plugins/ArduinoOutput/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJDIR := $(OBJDIR)/$(LIBNAME)
44
TARGET := $(LIBNAME).so
55

66

7-
SRC_DIR := ${shell find -type d -print}
7+
SRC_DIR := ${shell find ./ -type d -print}
88
VPATH := $(SOURCE_DIRS)
99

1010
SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

‎Source/Plugins/BasicSpikeDisplay/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJDIR := $(OBJDIR)/$(LIBNAME)
44
TARGET := $(LIBNAME).so
55

66

7-
SRC_DIR := ${shell find -type d -print}
7+
SRC_DIR := ${shell find ./ -type d -print}
88
VPATH := $(SOURCE_DIRS)
99

1010
SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

‎Source/Plugins/CAR/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJDIR := $(OBJDIR)/$(LIBNAME)
44
TARGET := $(LIBNAME).so
55

66

7-
SRC_DIR := ${shell find -type d -print}
7+
SRC_DIR := ${shell find ./ -type d -print}
88
VPATH := $(SOURCE_DIRS)
99

1010
SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

‎Source/Plugins/ChannelMappingNode/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJDIR := $(OBJDIR)/$(LIBNAME)
44
TARGET := $(LIBNAME).so
55

66

7-
SRC_DIR := ${shell find -type d -print}
7+
SRC_DIR := ${shell find ./ -type d -print}
88
VPATH := $(SOURCE_DIRS)
99

1010
SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

‎Source/Plugins/FilterNode/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OBJDIR := $(OBJDIR)/$(LIBNAME)
44
TARGET := $(LIBNAME).so
55

66

7-
SRC_DIR := ${shell find -type d -print}
7+
SRC_DIR := ${shell find ./ -type d -print}
88
VPATH := $(SOURCE_DIRS)
99

1010
SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))

0 commit comments

Comments
 (0)