X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=93afaeda2fd1444f9ba4e37af2871fc602ea4b41;hb=8f955150ff2b642109552dd234089f9a038bb3d6;hp=bd428c81bb54bd52ec761598c8cddffbcad094c2;hpb=c39b290f02f49b68a3eb928fe1109cc7f6bf59eb;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index bd428c81b..93afaeda2 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -36,6 +36,7 @@ sources = """
           check_box.cc
           christie_certificate_panel.cc
           cinema_dialog.cc
+          closed_captions_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
           config_move_dialog.cc
@@ -49,23 +50,21 @@ sources = """
           content_version_dialog.cc
           content_view.cc
           controls.cc
-          closed_captions_dialog.cc
           credentials_download_certificate_panel.cc
           custom_scale_dialog.cc
           dcp_panel.cc
-          dcpomatic_button.cc
-          disk_warning_dialog.cc
-          dkdm_output_panel.cc
-          drive_wipe_warning_dialog.cc
-          email_dialog.cc
-          image_sequence_dialog.cc
-          isdcf_metadata_dialog.cc
           dcp_text_track_dialog.cc
+          dcpomatic_button.cc
+          dcpomatic_spin_ctrl.cc
           dir_picker_ctrl.cc
+          disk_warning_dialog.cc
           dkdm_dialog.cc
+          dkdm_output_panel.cc
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
+          drive_wipe_warning_dialog.cc
+          email_dialog.cc
           export_subtitles_dialog.cc
           export_video_file_dialog.cc
           file_picker_ctrl.cc
@@ -76,17 +75,19 @@ sources = """
           focus_manager.cc
           fonts_dialog.cc
           full_config_dialog.cc
+          full_language_tag_dialog.cc
           gain_calculator_dialog.cc
           gdc_certificate_panel.cc
           gl_video_view.cc
           hints_dialog.cc
           html_dialog.cc
+          i18n_hook.cc
+          image_sequence_dialog.cc
           instant_i18n_dialog.cc
           interop_metadata_dialog.cc
-          i18n_hook.cc
+          job_manager_view.cc
           job_view.cc
           job_view_dialog.cc
-          job_manager_view.cc
           kdm_advanced_dialog.cc
           kdm_cpl_panel.cc
           kdm_dialog.cc
@@ -97,7 +98,7 @@ sources = """
           make_chain_dialog.cc
           markers_dialog.cc
           message_dialog.cc
-          monitor_dialog.cc
+          metadata_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
           name_format_editor.cc
@@ -208,8 +209,8 @@ def configure(conf):
                                mandatory=True)
 
     if conf.env.TARGET_LINUX:
-        conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES'])
-    if conf.env.TARGET_WINDOWS:
+        conf.env.append_value('CXXFLAGS', ['-DGL_GLEXT_PROTOTYPES', '-DGLX_GLXEXT_PROTOTYPES'])
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
 
     if conf.options.static_wxwidgets:
@@ -264,7 +265,7 @@ def configure(conf):
 
     # Some rtaudio-configs don't include rtaudio as a link library.  Go figure.
     conf.env.LIB_RTAUDIO.append('rtaudio')
-    if conf.env.TARGET_WINDOWS:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         # Don't explicitly link with pthread on Windows
         conf.env.CFLAGS_RTAUDIO.remove('-pthread')
         conf.env.LINKFLAGS_RTAUDIO.remove('-pthread')
@@ -273,9 +274,11 @@ def configure(conf):
         conf.env.LIB_RTAUDIO.append('mfuuid')
         conf.env.LIB_RTAUDIO.append('wmcodecdspuuid')
 
-    if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32 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)
+        if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
+            conf.check_cfg(package='glew', args='--cflags --libs', uselib_store='GLEW', mandatory=True)
     else:
         conf.env.STLIB_GL = 'gl'
         conf.env.STLIB_GLU = 'glu'
@@ -309,8 +312,8 @@ def build(bld):
     obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'GTK GL GLU '
-    if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU '
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
+        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU GLEW '
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'