projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove specification of italic/bold fonts (#1451); synthesis will be used instead.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 5c026284e8bfe6e78d1d8c341378bc7f7c8d6324..183466106db5647e805752491f4a585d8a3157b8 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-33,9
+33,7
@@
sources = """
audio_plot.cc
barco_alchemy_certificate_panel.cc
batch_job_view.cc
audio_plot.cc
barco_alchemy_certificate_panel.cc
batch_job_view.cc
- subtitle_appearance_dialog.cc
- text_panel.cc
- text_view.cc
+ check_box.cc
christie_certificate_panel.cc
cinema_dialog.cc
colour_conversion_editor.cc
christie_certificate_panel.cc
cinema_dialog.cc
colour_conversion_editor.cc
@@
-47,9
+45,11
@@
sources = """
content_panel.cc
content_properties_dialog.cc
content_sub_panel.cc
content_panel.cc
content_properties_dialog.cc
content_sub_panel.cc
+ content_view.cc
controls.cc
closed_captions_dialog.cc
dcp_panel.cc
controls.cc
closed_captions_dialog.cc
dcp_panel.cc
+ dcpomatic_button.cc
email_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
email_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
@@
-67,12
+67,13
@@
sources = """
filter_editor.cc
focus_manager.cc
fonts_dialog.cc
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
hints_dialog.cc
initial_setup_dialog.cc
full_config_dialog.cc
gain_calculator_dialog.cc
gdc_certificate_panel.cc
hints_dialog.cc
initial_setup_dialog.cc
+ instant_i18n_dialog.cc
+ i18n_hook.cc
job_view.cc
job_view_dialog.cc
job_manager_view.cc
job_view.cc
job_view_dialog.cc
job_manager_view.cc
@@
-105,11
+106,17
@@
sources = """
screen_dialog.cc
screens_panel.cc
self_dkdm_dialog.cc
screen_dialog.cc
screens_panel.cc
self_dkdm_dialog.cc
+ send_i18n_dialog.cc
server_dialog.cc
servers_list_dialog.cc
server_dialog.cc
servers_list_dialog.cc
+ standard_controls.cc
+ static_text.cc
+ subtitle_appearance_dialog.cc
system_font_dialog.cc
table_dialog.cc
templates_dialog.cc
system_font_dialog.cc
table_dialog.cc
templates_dialog.cc
+ text_panel.cc
+ text_view.cc
time_picker.cc
timecode.cc
timeline.cc
time_picker.cc
timecode.cc
timeline.cc
@@
-134,12
+141,15
@@
sources = """
"""
def configure(conf):
"""
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,
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
std,richtext'
,
+ args='--cppflags --cxxflags --libs
%s' % wx_libs
,
uselib_store='WXWIDGETS',
mandatory=True)
except:
uselib_store='WXWIDGETS',
mandatory=True)
except:
@@
-148,7
+158,7
@@
def configure(conf):
conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
package='',
path=wx_config,
conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
package='',
path=wx_config,
- args='--cppflags --cxxflags --libs
std,richtext'
,
+ args='--cppflags --cxxflags --libs
%s' % wx_libs
,
uselib_store='WXWIDGETS',
mandatory=True)
except:
uselib_store='WXWIDGETS',
mandatory=True)
except:
@@
-156,7
+166,7
@@
def configure(conf):
conf.check_cfg(msg='Checking for wxWidgets using wx-config',
package='',
path=wx_config,
conf.check_cfg(msg='Checking for wxWidgets using wx-config',
package='',
path=wx_config,
- args='--cppflags --cxxflags --libs
std,richtext'
,
+ args='--cppflags --cxxflags --libs
%s' % wx_libs
,
uselib_store='WXWIDGETS',
mandatory=True)
uselib_store='WXWIDGETS',
mandatory=True)
@@
-241,7
+251,10
@@
def build(bld):
if bld.env.TARGET_OSX:
obj.framework = ['CoreAudio']
obj.use = 'libdcpomatic2'
if bld.env.TARGET_OSX:
obj.framework = ['CoreAudio']
obj.use = 'libdcpomatic2'
- obj.source = sources
+ if bld.env.VARIANT == 'swaroop':
+ obj.source = sources + " swaroop_controls.cc"
+ else:
+ obj.source = sources
obj.target = 'dcpomatic2-wx'
i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)
obj.target = 'dcpomatic2-wx'
i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)