diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-16 15:15:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 16:45:01 +0100 |
| commit | 424cb7ac64291f158461d9fb35b848be17ae4abd (patch) | |
| tree | 3a52fc04300d40a8f17552d835b11a9d0f4c2e7b | |
| parent | 86cfe374e20b1fd9b38cdd1fc12999e8b5981d7a (diff) | |
Naming fixes; add debug option.
| -rw-r--r-- | asdcplib-cth.pc.in | 2 | ||||
| -rw-r--r-- | src/wscript | 2 | ||||
| -rw-r--r-- | wscript | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/asdcplib-cth.pc.in b/asdcplib-cth.pc.in index 9a7a13e..addac7f 100644 --- a/asdcplib-cth.pc.in +++ b/asdcplib-cth.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ -Name: asdcplib-cth +Name: libasdcp-cth Description: asdcplib with patches by cth@carlh.net Version: @version@ Requires: openssl diff --git a/src/wscript b/src/wscript index 4a49f5c..c60dd16 100644 --- a/src/wscript +++ b/src/wscript @@ -112,7 +112,7 @@ def build(bld): CRC16.h """ - bld.install_files('${PREFIX}/include/asdcplib-cth', headers) + bld.install_files('${PREFIX}/include/libasdcp-cth', headers) if bld.env.STATIC: bld.install_files('${PREFIX}/lib', 'libkumu-cth.a') bld.install_files('${PREFIX}/lib', 'libasdcp-cth.a') @@ -4,12 +4,13 @@ import sys import distutils.spawn from waflib import Logs -APPNAME = 'asdcplib-cth' +APPNAME = 'libasdcp-cth' VERSION = '2.5.11-cth1' def options(opt): opt.load('compiler_cxx') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--static', action='store_true', default=False, help='build statically') def configure(conf): @@ -31,7 +32,10 @@ def configure(conf): else: boost_lib_suffix = '' - conf.env.append_value('CXXFLAGS', '-O2') + if conf.options.enable_debug: + conf.env.append_value('CXXFLAGS', '-g') + else: + conf.env.append_value('CXXFLAGS', '-O2') conf.check_cxx(fragment=""" #include <boost/version.hpp>\n @@ -62,10 +66,10 @@ def build(bld): else: boost_lib_suffix = '' - bld(source='asdcplib-cth.pc.in', + bld(source='libasdcp-cth.pc.in', version=VERSION, - includedir='%s/include/asdcplib-cth' % bld.env.PREFIX, - libs="-L${libdir} -lasdcplib-cth -lkumu-cth -lboost_system%s" % boost_lib_suffix, + includedir='%s/include/libasdcp-cth' % bld.env.PREFIX, + libs="-L${libdir} -lasdcp-cth -lkumu-cth -lboost_system%s" % boost_lib_suffix, install_path='${LIBDIR}/pkgconfig') bld.recurse('src') |