projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
White space.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 22d9f0db6a18938d045c6446feaa6f121a5630c8..83e2022b3bb9728a61f2c2f48edeef71d7d7a303 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-40,6
+40,7
@@
sources = """
config_dialog.cc
config_move_dialog.cc
confirm_kdm_email_dialog.cc
config_dialog.cc
config_move_dialog.cc
confirm_kdm_email_dialog.cc
+ content_advanced_dialog.cc
content_colour_conversion_dialog.cc
content_menu.cc
content_panel.cc
content_colour_conversion_dialog.cc
content_menu.cc
content_panel.cc
@@
-49,6
+50,7
@@
sources = """
controls.cc
closed_captions_dialog.cc
credentials_download_certificate_panel.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
dcp_panel.cc
dcpomatic_button.cc
disk_warning_dialog.cc
@@
-165,7
+167,7
@@
sources = """
def configure(conf):
def configure(conf):
- wx_libs = 'core,richtext,adv,html,xml'
+ wx_libs = 'core,richtext,adv,html,xml
,propgrid
'
try:
wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
try:
wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
@@
-199,7
+201,7
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
if conf.options.static_wxwidgets:
conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
if conf.options.static_wxwidgets:
- # wx-config returns its static libraries as full paths, without -l prefixes, which confuses
+
# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
# check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
stlibs = []
new_linkflags = []
# check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
stlibs = []
new_linkflags = []