summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2021-01-02 13:21:54 +0100
committerDavid Robillard <d@drobilla.net>2021-01-02 13:21:54 +0100
commit228587c7cbc7021a5fe700111d63aba63a0a70d8 (patch)
tree9713b6ec63d7406769425c38d8ccf84f9120e591
parent8c906c7e38627daf33c15c5269d8ea721baa418e (diff)
downloadsuil-228587c7cbc7021a5fe700111d63aba63a0a70d8.tar.gz
suil-228587c7cbc7021a5fe700111d63aba63a0a70d8.tar.bz2
suil-228587c7cbc7021a5fe700111d63aba63a0a70d8.zip
Use SUIL_STATIC instead of SUIL_SHARED to control visibility
For consistency, this seems to be the most common convention.
-rw-r--r--include/suil/suil.h2
-rw-r--r--wscript30
2 files changed, 16 insertions, 16 deletions
diff --git a/include/suil/suil.h b/include/suil/suil.h
index f838512..a281c9d 100644
--- a/include/suil/suil.h
+++ b/include/suil/suil.h
@@ -34,7 +34,7 @@
# define SUIL_LIB_EXPORT __attribute__((visibility("default")))
#endif
-#ifdef SUIL_SHARED
+#ifndef SUIL_STATIC
# ifdef SUIL_INTERNAL
# define SUIL_API SUIL_LIB_EXPORT
# else
diff --git a/wscript b/wscript
index 538c566..7fe96f5 100644
--- a/wscript
+++ b/wscript
@@ -286,7 +286,7 @@ def build(bld):
source = 'src/host.c src/instance.c',
target = 'suil-%s' % SUIL_MAJOR_VERSION,
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
name = 'libsuil',
vnum = SUIL_VERSION,
install_path = '${LIBDIR}',
@@ -301,7 +301,7 @@ def build(bld):
source = 'src/host.c src/instance.c',
target = 'suil-%s' % SUIL_MAJOR_VERSION,
includes = ['.', 'include'],
- defines = ['SUIL_INTERNAL'],
+ defines = ['SUIL_STATIC', 'SUIL_INTERNAL'],
name = 'libsuil_static',
vnum = SUIL_VERSION,
install_path = '${LIBDIR}',
@@ -314,7 +314,7 @@ def build(bld):
source = 'src/gtk2_in_qt4.cpp',
target = 'suil_gtk2_in_qt4',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cxxflags = cflags,
lib = modlib,
@@ -325,7 +325,7 @@ def build(bld):
source = 'src/gtk2_in_qt5.cpp',
target = 'suil_gtk2_in_qt5',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cxxflags = cflags,
lib = modlib,
@@ -336,7 +336,7 @@ def build(bld):
source = 'src/qt4_in_gtk2.cpp',
target = 'suil_qt4_in_gtk2',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cxxflags = cflags,
lib = modlib,
@@ -348,7 +348,7 @@ def build(bld):
source = 'src/qt5_in_gtk.cpp',
target = 'suil_qt5_in_gtk2',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cxxflags = cflags,
lib = modlib,
@@ -360,7 +360,7 @@ def build(bld):
source = 'src/x11_in_gtk2.c',
target = 'suil_x11_in_gtk2',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib + ['X11'],
@@ -372,7 +372,7 @@ def build(bld):
source = 'src/x11_in_gtk3.c',
target = 'suil_x11_in_gtk3',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib + ['X11'],
@@ -384,7 +384,7 @@ def build(bld):
source = 'src/qt5_in_gtk.cpp',
target = 'suil_qt5_in_gtk3',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -396,7 +396,7 @@ def build(bld):
source = 'src/cocoa_in_gtk2.mm',
target = 'suil_cocoa_in_gtk2',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -408,7 +408,7 @@ def build(bld):
source = 'src/win_in_gtk2.cpp',
target = 'suil_win_in_gtk2',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -420,7 +420,7 @@ def build(bld):
source = 'src/x11_in_qt4.cpp',
target = 'suil_x11_in_qt4',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -431,7 +431,7 @@ def build(bld):
source = 'src/x11_in_qt5.cpp',
target = 'suil_x11_in_qt5',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -442,7 +442,7 @@ def build(bld):
source = 'src/cocoa_in_qt5.mm',
target = 'suil_cocoa_in_qt5',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,
@@ -454,7 +454,7 @@ def build(bld):
source = 'src/x11.c',
target = 'suil_x11',
includes = ['.', 'include'],
- defines = ['SUIL_SHARED', 'SUIL_INTERNAL'],
+ defines = ['SUIL_INTERNAL'],
install_path = module_dir,
cflags = cflags,
lib = modlib,