X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=8297f37c9f72f10ea86cc6a33f22bc32e081ff47;hb=0f42e807a707249cd1a60fa6e476cb47a4147c5a;hp=2b3bb46d6d8c6a8814b5ca5c6eb079006c901015;hpb=8457cc9b9437f7fb5f63f56723e04636ad4768b6;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index 2b3bb46d6..8297f37c9 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -44,7 +44,6 @@ sources = """ dcp_panel.cc email_dialog.cc image_sequence_dialog.cc - image_subtitle_colour_dialog.cc isdcf_metadata_dialog.cc dir_picker_ctrl.cc dolby_doremi_certificate_panel.cc @@ -52,6 +51,7 @@ sources = """ download_certificate_panel.cc file_picker_ctrl.cc film_editor.cc + film_name_location_dialog.cc film_viewer.cc filter_dialog.cc filter_editor.cc @@ -69,8 +69,8 @@ sources = """ key_dialog.cc make_chain_dialog.cc move_to_dialog.cc + nag_dialog.cc name_format_editor.cc - new_film_dialog.cc normal_job_view.cc playhead_to_timecode_dialog.cc playhead_to_frame_dialog.cc @@ -84,12 +84,12 @@ sources = """ self_dkdm_dialog.cc server_dialog.cc servers_list_dialog.cc + subtitle_appearance_dialog.cc subtitle_panel.cc subtitle_view.cc system_font_dialog.cc table_dialog.cc templates_dialog.cc - text_subtitle_appearance_dialog.cc time_picker.cc timecode.cc timeline.cc @@ -180,7 +180,6 @@ def configure(conf): conf.env.LIB_RTAUDIO.append('rtaudio') # Don't explicitly link with pthread on Windows if conf.env.TARGET_WINDOWS: - print conf.env conf.env.CFLAGS_RTAUDIO.remove('-pthread') conf.env.LINKFLAGS_RTAUDIO.remove('-pthread') @@ -210,6 +209,8 @@ def build(bld): obj.uselib += 'GTK ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER ' + if bld.env.TARGET_OSX: + obj.framework = ['CoreAudio'] obj.use = 'libdcpomatic2' obj.source = sources obj.target = 'dcpomatic2-wx'