reverse the visibility.h files assumptions that we don't build shared libs by default

This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.

Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.

8 files changed, 12 insertions, 32 deletions

diff --git a/libs/surfaces/control_protocol/control_protocol/visibility.h b/libs/surfaces/control_protocol/control_protocol/visibility.h
index 40c83b8580..418fb6d2b3 100644
--- a/libs/surfaces/control_protocol/control_protocol/visibility.h
+++ b/libs/surfaces/control_protocol/control_protocol/visibility.h
@@ -30,27 +30,21 @@
   #define LIBCONTROLCP_DLL_EXPORT __declspec(dllexport)
   #define LIBCONTROLCP_DLL_LOCAL
 #else
-  #if __GNUC__ >= 4
-    #define LIBCONTROLCP_DLL_IMPORT __attribute__ ((visibility ("default")))
-    #define LIBCONTROLCP_DLL_EXPORT __attribute__ ((visibility ("default")))
-    #define LIBCONTROLCP_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define LIBCONTROLCP_DLL_IMPORT
-    #define LIBCONTROLCP_DLL_EXPORT
-    #define LIBCONTROLCP_DLL_LOCAL
-  #endif
+  #define LIBCONTROLCP_DLL_IMPORT __attribute__ ((visibility ("default")))
+  #define LIBCONTROLCP_DLL_EXPORT __attribute__ ((visibility ("default")))
+  #define LIBCONTROLCP_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
 #endif
 
-#ifdef LIBCONTROLCP_DLL // libcontrolcp is a DLL
-#ifdef LIBCONTROLCP_DLL_EXPORTS // defined if we are building the libcontrolcp DLL (instead of using it)
-    #define LIBCONTROLCP_API LIBCONTROLCP_DLL_EXPORT
+#ifdef LIBCONTROLCP_STATIC // libcontrolcp is not a DLL
+  #define LIBCONTROLCP_API
+  #define LIBCONTROLCP_LOCAL
 #else
+  #ifdef LIBCONTROLCP_DLL_EXPORTS // defined if we are building the libcontrolcp DLL (instead of using it)
+    #define LIBCONTROLCP_API LIBCONTROLCP_DLL_EXPORT
+  #else
     #define LIBCONTROLCP_API LIBCONTROLCP_DLL_IMPORT
-#endif 
-#define     LIBCONTROLCP_LOCAL LIBCONTROLCP_DLL_LOCAL
-#else /* static lib, not DLL */
-#define LIBCONTROLCP_API
-#define LIBCONTROLCP_LOCAL
+  #endif 
+  #define LIBCONTROLCP_LOCAL LIBCONTROLCP_DLL_LOCAL
 #endif
 
 #endif /* __libcontrolcp_visibility_h__ */
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index a597ca9e2a..7c53bbfb17 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -28,9 +28,7 @@ def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=controlcp_sources)
         # defines for this library
-        obj.defines      = [ 'LIBCONTROLCP_DLL=1', 'LIBCONTROLCP_DLL_EXPORTS=1' ]
-        # internal shared libs that we use
-        obj.defines     += [ 'LIBPBD_DLL=1', 'LIBARDOUR_DLL=1', 'LIBEVORAL_DLL=1' ]
+        obj.defines      = [ 'LIBCONTROLCP_DLL_EXPORTS=1' ]
         obj.cxxflags     = [ '-fvisibility=hidden' ]
         obj.cflags       = [ '-fvisibility=hidden' ]
     else:
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index aa7d119895..ac8341c64d 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -35,8 +35,6 @@ def build(bld):
     '''
     obj.export_includes = ['./generic_midi']
     obj.defines     = [ 'PACKAGE="ardour_frontier"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1' ]
     obj.includes     = ['.', './generic_midi']
     obj.name         = 'libgeneric_midi'
     obj.target       = 'generic_midi'
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index cdc68529ac..186f270463 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -31,8 +31,6 @@ def build(bld):
     '''
     obj.export_includes = ['.']
     obj.defines     = [ 'PACKAGE="ardour_genericmidi"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
     obj.includes     = ['.', './generic_midi']
     obj.name         = 'libardour_generic_midi'
     obj.target       = 'ardour_generic_midi'
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index d76a26f651..beba402fa1 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -43,8 +43,6 @@ def build(bld):
     '''
     obj.export_includes = ['./mackie']
     obj.defines     = [ 'PACKAGE="ardour_mackie"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
     # need ../libs because some GTK2 header files require stuff there
     obj.includes     = ['.', '../libs']
     obj.name         = 'libardour_mcp'
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 88174c0faf..cd77f99871 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -28,8 +28,6 @@ def build(bld):
     '''
     obj.export_includes = ['.']
     obj.defines     = [ 'PACKAGE="ardour_osc"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
     obj.includes     = ['.', './osc']
     obj.name         = 'libardour_osc'
     obj.target       = 'ardour_osc'
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index 7d80295fba..dfc10f5525 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -40,8 +40,6 @@ def build(bld):
     '''
     obj.export_includes = ['./tranzport']
     obj.defines     = [ 'PACKAGE="ardour_tranzport"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1' ]
     obj.includes     = ['.', './tranzport']
     obj.name         = 'libardour_tranzport'
     obj.target       = 'ardour_tranzport'
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 623aa960db..f3c36275c8 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -26,8 +26,6 @@ def build(bld):
     '''
     obj.export_includes = ['./wiimote']
     obj.defines     = [ 'PACKAGE="ardour_wiimote"' ]
-    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
     obj.includes     = ['.', '../libs']
     obj.name         = 'libardour_wiimote'
     obj.target       = 'ardour_wiimote'