ASDCPLib builds.

7 files changed, 73 insertions, 21 deletions

diff --git a/asdcplib/src/wscript b/asdcplib/src/wscript
new file mode 100644
index 00000000..77d67d5f
--- /dev/null
+++ b/asdcplib/src/wscript
@@ -0,0 +1,58 @@
+def configure(conf):
+    conf.check_cc(msg = 'Checking for library expat', header_name = 'tiffio.h', lib = 'expat', uselib_store = 'EXPAT', mandatory = True)
+    conf.env.append_value('CXXFLAGS', '-DHAVE_EXPAT')
+    conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')
+    conf.env.append_value('CXXFLAGS', '-DPACKAGE_VERSION="1.9.45-dvdomatic"')
+    # XXX: ?
+    conf.env.append_value('CXXFLAGS', '-DASDCP_PLATFORM="linux"')
+
+def build(bld):
+    obj = bld(features = 'cxx cxxshlib')
+    obj.name = 'libkumu-libdcp'
+    obj.target = 'libkumu-libdcp'
+    obj.uselib = 'EXPAT'
+    obj.includes = ['.']
+    obj.export_includes = ['.']
+    obj.source = """
+                 KM_fileio.cpp
+                 KM_log.cpp
+		 KM_util.cpp
+		 KM_xml.cpp
+                 KM_tai.cpp
+                 KM_prng.cpp
+                 """
+
+    obj = bld(features = 'cxx cxxshlib')
+    obj.name = 'libasdcp-libdcp'
+    obj.target = 'libasdcp-libdcp'
+    obj.uselib = 'EXPAT'
+    obj.includes = ['.']
+    obj.export_includes = ['.']
+    obj.source = """
+		 MPEG2_Parser.cpp
+                 MPEG.cpp
+                 JP2K_Codestream_Parser.cpp
+		 JP2K_Sequence_Parser.cpp
+                 JP2K.cpp
+                 PCM_Parser.cpp
+                 Wav.cpp
+		 TimedText_Parser.cpp
+                 KLV.cpp 
+                 Dict.cpp
+                 MXFTypes.cpp
+                 MXF.cpp
+		 Index.cpp
+                 Metadata.cpp
+                 AS_DCP.cpp
+                 AS_DCP_MXF.cpp
+                 AS_DCP_AES.cpp
+                 h__Reader.cpp
+                 h__Writer.cpp
+                 AS_DCP_MPEG2.cpp
+                 AS_DCP_JP2K.cpp
+                 AS_DCP_PCM.cpp
+                 AS_DCP_TimedText.cpp
+                 PCMParserList.cpp
+                 MDD.cpp
+                 """
+    
diff --git a/asdcplib/wscript b/asdcplib/wscript
new file mode 100644
index 00000000..7d669b7f
--- /dev/null
+++ b/asdcplib/wscript
@@ -0,0 +1,5 @@
+def configure(conf):
+    conf.recurse('src')
+
+def build(bld):
+    bld.recurse('src')
diff --git a/src/asset.cc b/src/asset.cc
index 2101e4bb..d4214d5f 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -18,8 +18,8 @@
 */
 
 #include <boost/filesystem.hpp>
-#include <AS_DCP.h>
-#include <KM_util.h>
+#include "AS_DCP.h"
+#include "KM_util.h"
 #include "asset.h"
 #include "util.h"
 #include "tags.h"
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 4e3b0227..848a2c27 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -21,8 +21,8 @@
 #include <stdexcept>
 #include <iostream>
 #include <boost/filesystem.hpp>
-#include <AS_DCP.h>
-#include <KM_fileio.h>
+#include "AS_DCP.h"
+#include "KM_fileio.h"
 #include "picture_asset.h"
 #include "util.h"
 
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 30083719..873b4755 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <boost/filesystem.hpp>
-#include <AS_DCP.h>
+#include "AS_DCP.h"
 #include "sound_asset.h"
 #include "util.h"
 
diff --git a/src/wscript b/src/wscript
index 22b75b97..fce3959a 100644
--- a/src/wscript
+++ b/src/wscript
@@ -2,7 +2,8 @@ def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.name = 'libdcp'
     obj.export_includes = ['.']
-    obj.uselib = 'ASDCP KUMU BOOST_FILESYSTEM OPENSSL SIGC++'
+    obj.uselib = 'BOOST_FILESYSTEM OPENSSL SIGC++'
+    obj.use = 'libkumu-libdcp libasdcp-libdcp'
     obj.source = """
                  dcp.cc
                  asset.cc
diff --git a/wscript b/wscript
index b28c366b..0e407295 100644
--- a/wscript
+++ b/wscript
@@ -6,23 +6,9 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Werror', '-Wextra', '-O2', '-D_FILE_OFFSET_BITS=64'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-D_FILE_OFFSET_BITS=64'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
-    conf.check_cc(msg = 'Checking for libkumu',
-                  function_name = 'Kumu::Version',
-                  header_name = 'KM_util.h',
-                  lib = 'kumu',
-                  uselib_store = 'KUMU',
-                  mandatory = True)
-
-    conf.check_cc(msg = 'Checking for asdcplib',
-                  function_name = 'ASDCP::Version',
-                  header_name = 'AS_DCP.h',
-                  lib = 'asdcp',
-                  uselib_store = 'ASDCP',
-                  mandatory = True)
-
     conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
     conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
     
@@ -36,8 +22,10 @@ def configure(conf):
                    uselib_store = 'BOOST_FILESYSTEM')
 
     conf.recurse('test')
+    conf.recurse('asdcplib')
 
 def build(bld):
     bld.recurse('src')
     bld.recurse('test')
+    bld.recurse('asdcplib')