From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- ccast/Jamfile | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) mode change 100644 => 100755 ccast/Jamfile (limited to 'ccast/Jamfile') diff --git a/ccast/Jamfile b/ccast/Jamfile old mode 100644 new mode 100755 index ff216ff..3d03a2f --- a/ccast/Jamfile +++ b/ccast/Jamfile @@ -9,9 +9,12 @@ if $(NT) { DEFINES += WIN32 ; } -SubInclude axTLS ; +if $(SSLLIB) { + DEFINES += USING_AXTLS ; # Trigger right #include + SubInclude axTLS ; +} -HDRS = ../h ../numlib ../spectro axTLS chan ../yajl ; +HDRS = ../h ../numlib ../spectro $(SSLINC) chan ../yajl ; # We create the channel protocol buffers implementation files thus: # /src/protobuf_c/protobuf.exe --c_out=chan cast_channel.proto @@ -21,14 +24,19 @@ CHAN_SRC = chan/protobuf-c.c ; +Objects ccmes.c $(CHAN_SRC) : : : axTLS ; +Objects ccmdns.c ccpacket.c ccast.c dpat.c ; + # ccast library -Library libccast : ccmdns.c ccpacket.c ccmes.c ccast.c $(CHAN_SRC) dpat.c ; +LibraryFromObjects libccast : ccmdns ccpacket ccmes ccast $(CHAN_SRC) dpat ; -LINKLIBS = ./libccast axTLS/libaxtls ../yajl/libyajl ../numlib/libnum ../spectro/libconv ; +LINKLIBS = ./libccast $(SSLLIB) ../yajl/libyajl ../numlib/libnum ../spectro/libconv ; + +# If run in ccast dir, the following don't link from clean, +# due to the _NormPaths rule not resolving ../ccast into . # Test harness #Main cctest : cctest.c ; Main filt : filt.c ; - MainVariant dpat : dpat.c : : STANDALONE_TEST ; -- cgit v1.2.3