X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=04db716a480e7d37ed38ecfebddc77ca3942f4fe;hb=44b57d623dec97a3f9955082f0b8a7a8d27b7518;hp=a263a13d1597f22f44cce74477cda44d214a5ab7;hpb=2525b527f279a130155d40b7ee57057897270915;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index a263a13d1..04db716a4 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,25 +1,23 @@
-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')
     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'
-    if bld.env.DEBUG_HASH:
-        obj.uselib += ' MHASH'
+    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP GLIB'
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += ' WINSOCK2'
     obj.source = """
 		 ab_transcode_job.cc
 		 ab_transcoder.cc
+                 check_hashes_job.cc
 		 config.cc
 		 copy_from_dvd_job.cc
+                 cross.cc
 		 dcp_content_type.cc
 		 dcp_video_frame.cc
                  decoder.cc
                  decoder_factory.cc
                  delay_line.cc
+                 dolby_cp750.cc
                  dvd.cc
 		 encoder.cc
                  encoder_factory.cc
@@ -32,6 +30,7 @@ def build(bld):
 		 format.cc
                  image.cc
                  imagemagick_decoder.cc
+                 imagemagick_encoder.cc
 		 j2k_still_encoder.cc
 		 j2k_wav_encoder.cc
 		 job.cc
@@ -39,18 +38,22 @@ def build(bld):
 		 log.cc
 		 lut.cc
 		 make_dcp_job.cc
-                 player.cc
-                 player_manager.cc
+                 scp_dcp_job.cc
 		 scaler.cc
                  screen.cc
 		 server.cc
-                 scp_dcp_job.cc
-		 thumbs_job.cc
+                 sound_processor.cc
+                 stream.cc
+                 subtitle.cc
                  tiff_decoder.cc
-	         tiff_encoder.cc
                  timer.cc
 		 transcode_job.cc
 		 transcoder.cc
 		 util.cc
+		 version.cc
 		 """
+
+    if not bld.env.DISABLE_PLAYER:
+        obj.source += " player.cc player_manager.cc"
+
     obj.target = 'dvdomatic'