Merge pull request #95 from cstawarz/symbol_visibility_fixes

aacuevas · web-flow · commit cea62813fe81 · 2016-10-14T17:16:59.000+02:00
Symbol visibility fixes
diff --git a/.gitignore b/.gitignore
@@ -116,6 +116,8 @@ Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.pbxuser
 Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/xcuserdata
 Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.xcworkspace
 Introjucer/Builds/MacOSX/build
+Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
+Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
 
 # 9. Plugin build dirs
 build/
diff --git a/Builds/MacOSX/Plugins/Config/Plugin.xcconfig b/Builds/MacOSX/Plugins/Config/Plugin.xcconfig
@@ -32,7 +32,6 @@ DEBUG_INFORMATION_FORMAT = dwarf
 ENABLE_STRICT_OBJC_MSGSEND = YES
 GCC_C_LANGUAGE_STANDARD = c99
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES
-GCC_INLINES_ARE_PRIVATE_EXTERN = YES
 GCC_NO_COMMON_BLOCKS = YES
 GCC_OPTIMIZATION_LEVEL = 3
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) OEPLUGIN JUCER_XCODE_MAC_F6D2F4CF=1 JUCE_APP_VERSION=0.4.1 JUCE_APP_VERSION_HEX=0x401
diff --git a/Builds/MacOSX/Plugins/Config/Plugin_Debug.xcconfig b/Builds/MacOSX/Plugins/Config/Plugin_Debug.xcconfig
@@ -2,6 +2,7 @@
 
 ENABLE_TESTABILITY = YES
 GCC_DYNAMIC_NO_PIC = NO
+GCC_INLINES_ARE_PRIVATE_EXTERN = NO
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1 _DEBUG=1
 MTL_ENABLE_DEBUG_INFO = YES
 ONLY_ACTIVE_ARCH = YES
diff --git a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
@@ -2020,7 +2020,7 @@
 					9069CE21141F5A4C5721BCF3,
 					65F4459CC1832883FFF6C166,
 					9069CE21141F5A4C5721BCF3, ); name = "juce_audio_devices"; sourceTree = "<group>"; };
-		43D700D1965DF684964ACAE6 = {isa = PBXGroup; children = (
+		217479BAEDCDC02C29C466EB = {isa = PBXGroup; children = (
 					B47FEE41896F01CE6EB42B36,
 					92A6643073EB8E38F6BBD39C,
 					30B1B20F186FC5FBA93D4C90,
@@ -2037,15 +2037,15 @@
 					9493FB479E4B4FA2D5C86724,
 					BE15A2B0B537B5CC343EF6F9,
 					63E801199DEC51DCFBB61890, ); name = private; sourceTree = "<group>"; };
-		81ED6AB2A5472FC995B6653F = {isa = PBXGroup; children = (
+		35E22AE46A6F6A700C3B3D94 = {isa = PBXGroup; children = (
 					AC91C85D2437C7D1286AFAAB,
 					D1B150DF1455287F67E629B2,
 					FE88B876367616EBFEA00713, ); name = protected; sourceTree = "<group>"; };
-		178CBDC0FAC7D537E3CC7E78 = {isa = PBXGroup; children = (
-					43D700D1965DF684964ACAE6,
-					81ED6AB2A5472FC995B6653F, ); name = include; sourceTree = "<group>"; };
-		DC301071305052CAAA2F0AB6 = {isa = PBXGroup; children = (
-					178CBDC0FAC7D537E3CC7E78,
+		17A7656AF0E66E5C7AD93D8E = {isa = PBXGroup; children = (
+					217479BAEDCDC02C29C466EB,
+					35E22AE46A6F6A700C3B3D94, ); name = include; sourceTree = "<group>"; };
+		2FC2E6E13664F64828C03461 = {isa = PBXGroup; children = (
+					17A7656AF0E66E5C7AD93D8E,
 					AD9B515651FF2143CA089351,
 					6C12F08C8B6CBD125DC897AF,
 					5F8BCA4580A738F645A05D8A,
@@ -2062,7 +2062,7 @@
 					D45F7C723822356F362B8262,
 					AF2216C76163EB0A76390FE9, ); name = libFLAC; sourceTree = "<group>"; };
 		1EA82693D5711953C949B39F = {isa = PBXGroup; children = (
-					DC301071305052CAAA2F0AB6,
+					2FC2E6E13664F64828C03461,
 					C68F078AF94886343CBF6DAD,
 					18ADA4B7F8ABC14FC3ABCD39,
 					BFD1914F80C897BF775D7C92,
@@ -3340,6 +3340,7 @@
 				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"_DEBUG=1",
diff --git a/PluginGenerator/JuceLibraryCode/BinaryData.cpp b/PluginGenerator/JuceLibraryCode/BinaryData.cpp
@@ -610,7 +610,7 @@ static const unsigned char temp_binary_data_6[] =
 "    #include <Windows.h>\n"
 "    #define EXPORT __declspec(dllexport)\n"
 "#else\n"
-"    #define EXPORT\n"
+"    #define EXPORT __attribute__((visibility(\"default\")))\n"
 "#endif\n"
 "\n"
 "using namespace Plugin;\n"
@@ -6076,7 +6076,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
         case 0x9a9516bc:  numBytes = 1817; return openEphys_DataThreadPluginTemplate_h;
         case 0xd768da9a:  numBytes = 1487; return openEphys_FileSourcePluginTemplate_cpp;
         case 0xdc872b1f:  numBytes = 1450; return openEphys_FileSourcePluginTemplate_h;
-        case 0x354e9a48:  numBytes = 4216; return openEphys_OpenEphysLibTemplate_cpp;
+        case 0x354e9a48:  numBytes = 4255; return openEphys_OpenEphysLibTemplate_cpp;
         case 0xbf9557ba:  numBytes = 923; return openEphys_PluginMakefile_example;
         case 0x0d98caa2:  numBytes = 2993; return openEphys_ProcessorContentComponentTemplate_cpp;
         case 0x20837d27:  numBytes = 2348; return openEphys_ProcessorContentComponentTemplate_h;
diff --git a/PluginGenerator/JuceLibraryCode/BinaryData.h b/PluginGenerator/JuceLibraryCode/BinaryData.h
@@ -28,7 +28,7 @@ namespace BinaryData
     const int            openEphys_FileSourcePluginTemplate_hSize = 1450;
 
     extern const char*   openEphys_OpenEphysLibTemplate_cpp;
-    const int            openEphys_OpenEphysLibTemplate_cppSize = 4216;
+    const int            openEphys_OpenEphysLibTemplate_cppSize = 4255;
 
     extern const char*   openEphys_PluginMakefile_example;
     const int            openEphys_PluginMakefile_exampleSize = 923;
diff --git a/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp b/Source/Plugins/ArduinoOutput/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp b/Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/BinaryWriter/OpenEphysLib.cpp b/Source/Plugins/BinaryWriter/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 
diff --git a/Source/Plugins/CAR/OpenEphysLib.cpp b/Source/Plugins/CAR/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp b/Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/EcubeSource/OpenEphysLib.cpp b/Source/Plugins/EcubeSource/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/EventBroadcaster/OpenEphysLib.cpp b/Source/Plugins/EventBroadcaster/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/FilterNode/OpenEphysLib.cpp b/Source/Plugins/FilterNode/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/JuliaProcessor/OpenEphysLib.cpp b/Source/Plugins/JuliaProcessor/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/KWIKFormat/OpenEphysLib.cpp b/Source/Plugins/KWIKFormat/OpenEphysLib.cpp
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 
diff --git a/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp b/Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/LfpDisplayNodeBeta/OpenEphysLib.cpp b/Source/Plugins/LfpDisplayNodeBeta/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/NetworkEvents/OpenEphysLib.cpp b/Source/Plugins/NetworkEvents/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/PCIeRhythm/OpenEphysLib.cpp b/Source/Plugins/PCIeRhythm/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/PhaseDetector/OpenEphysLib.cpp b/Source/Plugins/PhaseDetector/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp b/Source/Plugins/PulsePalOutput/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/RecordControl/OpenEphysLib.cpp b/Source/Plugins/RecordControl/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/Rectifier/OpenEphysLib.cpp b/Source/Plugins/Rectifier/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/SerialInput/OpenEphysLib.cpp b/Source/Plugins/SerialInput/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/SpikeRaster/OpenEphysLib.cpp b/Source/Plugins/SpikeRaster/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Plugins/SpikeSorter/OpenEphysLib.cpp b/Source/Plugins/SpikeSorter/OpenEphysLib.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Windows.h>
 #define EXPORT __declspec(dllexport)
 #else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Processors/PluginManager/Templates/openEphys_OpenEphysLibTemplate.cpp b/Source/Processors/PluginManager/Templates/openEphys_OpenEphysLibTemplate.cpp
@@ -28,7 +28,7 @@
     #include <Windows.h>
     #define EXPORT __declspec(dllexport)
 #else
-    #define EXPORT
+    #define EXPORT __attribute__((visibility("default")))
 #endif
 
 using namespace Plugin;
diff --git a/Source/Processors/RecordNode/OriginalRecording.cpp b/Source/Processors/RecordNode/OriginalRecording.cpp
@@ -527,6 +527,7 @@ void OriginalRecording::writeContinuousBuffer(const float* data, int nSamples, i
     //std::cout << channel << " : " << nSamples << " : " << count << std::endl;
 
     jassert(count == nSamples); // make sure all the data was written
+    (void)count;  // Suppress unused variable warning in release builds
 
     diskWriteLock.exit();
 
@@ -719,4 +720,4 @@ RecordEngineManager* OriginalRecording::getEngineManager()
     param = new EngineParameter(EngineParameter::STR, 2, "Renamed files prefix", "CH");
     man->addParameter(param);
     return man;
-}
+}
diff --git a/open-ephys.jucer b/open-ephys.jucer
@@ -45,7 +45,7 @@
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
                        osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
-                       headerPath="JuceLibraryCode/" libraryPath="" defines=""/>
+                       headerPath="JuceLibraryCode/" libraryPath="" defines="" customXcodeFlags="GCC_INLINES_ARE_PRIVATE_EXTERN = NO"/>
         <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="open-ephys"
                        osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
                        headerPath="JuceLibraryCode/" libraryPath="" defines=""/>
