X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=c1786bb818b6566ee85b0c4cddff299cfd5f543a;hb=eb145ae0fc23ac9730de45e9f323e6b20019d745;hp=75f7eddeda2e779d33554d026aae70b6c7c7a81f;hpb=2fb6cdae8446699be824aaeb902f4bca1888657d;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 75f7edded..c1786bb81 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,40 +1,43 @@
-def configure(conf):
-    if conf.options.debug_hash:
-        conf.env.append_value('CXXFLAGS', '-DDEBUG_HASH')
-        conf.check_cc(msg = 'Checking for library libmhash', function_name = 'mhash_init', header_name = 'mhash.h', lib = 'mhash', uselib_store = 'MHASH')
-
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    if bld.env.STATIC:
+        obj = bld(features = 'cxx cxxstlib')
+    else:
+        obj = bld(features = 'cxx cxxshlib')
+
     obj.name = 'libdvdomatic'
     obj.export_includes = ['.']
-    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP'
+    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB'
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
-    if bld.env.DEBUG_HASH:
-        obj.uselib += ' MHASH'
     obj.source = """
 		 ab_transcode_job.cc
 		 ab_transcoder.cc
+                 audio_decoder.cc
+                 audio_source.cc
+                 check_hashes_job.cc
 		 config.cc
-		 copy_from_dvd_job.cc
+                 combiner.cc
                  cross.cc
 		 dcp_content_type.cc
 		 dcp_video_frame.cc
                  decoder.cc
                  decoder_factory.cc
                  delay_line.cc
-                 dvd.cc
+                 dolby_cp750.cc
 		 encoder.cc
                  encoder_factory.cc
 		 examine_content_job.cc
+		 external_audio_decoder.cc
+                 filter_graph.cc
                  ffmpeg_compatibility.cc
                  ffmpeg_decoder.cc
     	         film.cc
-		 film_state.cc
 		 filter.cc
 		 format.cc
+                 gain.cc
                  image.cc
                  imagemagick_decoder.cc
+                 imagemagick_encoder.cc
 		 j2k_still_encoder.cc
 		 j2k_wav_encoder.cc
 		 job.cc
@@ -42,21 +45,21 @@ def build(bld):
 		 log.cc
 		 lut.cc
 		 make_dcp_job.cc
+                 matcher.cc
                  scp_dcp_job.cc
 		 scaler.cc
-                 screen.cc
 		 server.cc
-		 thumbs_job.cc
-                 tiff_decoder.cc
-	         tiff_encoder.cc
+                 sound_processor.cc
+                 stream.cc
+                 subtitle.cc
                  timer.cc
 		 transcode_job.cc
 		 transcoder.cc
+                 ui_signaller.cc
 		 util.cc
 		 version.cc
+                 video_decoder.cc
+                 video_source.cc
 		 """
 
-    if not bld.env.DISABLE_PLAYER:
-        obj.source += " player.cc player_manager.cc"
-
     obj.target = 'dvdomatic'