diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-08 09:52:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:45:04 +0100 |
| commit | c314f25178bd32120dfc64ec72a7a94a32b1b7b0 (patch) | |
| tree | 63c327e78fea9dcc2b03272c86f30f31647c5ede /src | |
| parent | a6c709878735820af75ad887084f615fd3b8249d (diff) | |
Graphics rearrangement and probably breakage.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 8 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 382f867ca..72ac66706 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -105,16 +105,16 @@ class TaskBarIcon : public wxTaskBarIcon public: TaskBarIcon () { -#ifdef __WXMSW__ +#ifdef DCPOMATIC_WINDOWS wxIcon icon (std_to_wx ("taskbar_icon")); #endif -#ifdef __WXGTK__ +#ifdef DCPOMATIC_LINUX wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif -#ifndef __WXOSX__ +#ifndef DCPOMATIC_OSX /* XXX: fix this for OS X */ SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); #endif diff --git a/src/tools/wscript b/src/tools/wscript index eab03f8fd..262f193e4 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -55,7 +55,7 @@ def build(bld): obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: - obj.source += ' ../../platform/windows/dcpomatic.rc' + obj.source += ' ../../platform/windows/%s.rc' % t obj.target = t.replace('dcpomatic', 'dcpomatic2') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) |