From 228587c7cbc7021a5fe700111d63aba63a0a70d8 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 2 Jan 2021 13:21:54 +0100 Subject: Use SUIL_STATIC instead of SUIL_SHARED to control visibility For consistency, this seems to be the most common convention. --- wscript | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'wscript') 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, -- cgit v1.2.1