Fix up SimpleVideoView.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 4ddafc648500c7ab131703ed4b20a665fe6d945d..88987f1bf5db6346b2994d4c2b844a2e87e6bfc0 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -67,11 +67,12 @@ sources = """
           filter_editor.cc
           focus_manager.cc
           fonts_dialog.cc
-          font_files_dialog.cc
           full_config_dialog.cc
           gain_calculator_dialog.cc
           gdc_certificate_panel.cc
+          gl_video_view.cc
           hints_dialog.cc
+          html_dialog.cc
           initial_setup_dialog.cc
           instant_i18n_dialog.cc
           i18n_hook.cc
@@ -85,7 +86,9 @@ sources = """
           kdm_timing_panel.cc
           key_dialog.cc
           make_chain_dialog.cc
+          markers_dialog.cc
           message_dialog.cc
+          metadata_dialog.cc
           monitor_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
@@ -93,11 +96,14 @@ sources = """
           new_dkdm_folder_dialog.cc
           normal_job_view.cc
           paste_dialog.cc
+          password_entry.cc
           player_config_dialog.cc
           player_information.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
           question_dialog.cc
+          rating_dialog.cc
+          qube_certificate_panel.cc
           recreate_chain_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
@@ -110,15 +116,18 @@ sources = """
           send_i18n_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
+          simple_video_view.cc
           standard_controls.cc
           static_text.cc
           subtitle_appearance_dialog.cc
           system_font_dialog.cc
+          system_information_dialog.cc
           table_dialog.cc
           templates_dialog.cc
           text_panel.cc
           text_view.cc
           time_picker.cc
+          timer_display.cc
           timecode.cc
           timeline.cc
           timeline_atmos_content_view.cc
@@ -142,12 +151,15 @@ sources = """
           """
 
 def configure(conf):
+
+    wx_libs = 'core,richtext,adv,html,xml'
+
     try:
         wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
         conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
                        package='',
                        path=wx_config,
-                       args='--cppflags --cxxflags --libs core,richtext,adv',
+                       args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
     except:
@@ -156,7 +168,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs core,richtext,adv',
+                           args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
@@ -164,7 +176,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs core,richtext,adv',
+                           args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
 
@@ -216,10 +228,14 @@ def configure(conf):
 
     # Some rtaudio-configs don't include rtaudio as a link library.  Go figure.
     conf.env.LIB_RTAUDIO.append('rtaudio')
-    # Don't explicitly link with pthread on Windows
     if conf.env.TARGET_WINDOWS:
+        # Don't explicitly link with pthread on Windows
         conf.env.CFLAGS_RTAUDIO.remove('-pthread')
         conf.env.LINKFLAGS_RTAUDIO.remove('-pthread')
+        # We need some libraries for WASAPI
+        conf.env.LIB_RTAUDIO.append('mfplat')
+        conf.env.LIB_RTAUDIO.append('mfuuid')
+        conf.env.LIB_RTAUDIO.append('wmcodecdspuuid')
 
     conf.check_cxx(fragment="""
                             #include <RtAudio.h>\n
@@ -231,6 +247,13 @@ def configure(conf):
                    define_name='DCPOMATIC_USE_RTERROR',
                    mandatory=False)
 
+    if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX:
+        conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True)
+        conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True)
+    else:
+        conf.env.STLIB_GL = 'gl'
+        conf.env.STLIB_GLU = 'glu'
+
 
 
 def build(bld):
@@ -241,13 +264,13 @@ def build(bld):
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO '
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO GL GLU '
     if bld.env.TARGET_LINUX:
-        obj.uselib += 'GTK '
+        obj.uselib += 'GTK GL GLU '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER '
+        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU '
     if bld.env.TARGET_OSX:
-        obj.framework = ['CoreAudio']
+        obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'
     if bld.env.VARIANT == 'swaroop':
         obj.source = sources + " swaroop_controls.cc"