fix several inter-related problems with libptformat

This commit is contained in:
Paul Davis 2018-10-14 20:35:29 -04:00
parent a5a5ba1ace
commit 0cf27fd2cd
6 changed files with 17 additions and 198 deletions

View file

@ -14,6 +14,7 @@ LIBPTFORMAT_LIB_VERSION = '0.0.0'
# Variables for 'waf dist'
APPNAME = 'libptformat'
VERSION = LIBPTFORMAT_VERSION
I18N_PACKAGE = 'libptformat'
# Mandatory variables
top = '.'
@ -28,17 +29,22 @@ def configure(conf):
def build(bld):
# Library
obj = bld(features = 'cxx cxxshlib')
obj.source = 'ptfformat.cc'
obj.export_includes = ['.']
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib (features = 'cxx cxxshlib', source = [ 'ptfformat.cc' ])
obj.defines = [ 'LIBPTFORMAT_DLL_EXPORTS=1' ]
else:
obj = bld.stdlib (source = [ 'ptfformat.cc' ])
obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.export_includes = ['.']
obj.includes = ['.']
obj.name = 'libptformat'
obj.target = 'ptformat'
obj.use = 'libpbd'
autowaf.ensure_visible_symbols (obj, True)
obj.vnum = LIBPTFORMAT_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
obj.defines = [ 'LIBPTFORMAT_DLL_EXPORTS' ]
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
def shutdown():
autowaf.shutdown()