diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-01-16 21:15:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-01-20 15:04:35 +0000 |
| commit | 9e14cd0b1ff1d30f027fbd1351bd2a94b7e119d9 (patch) | |
| tree | ec064765f7f786d4c3d703441582e9c905701f89 /platform/windows | |
| parent | 125377b86f3b2e7f47c1e884b833a39ea27ae519 (diff) | |
Incorporate new icon by Julian van Mil for main DCP-o-matic.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/dcpomatic.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_batch.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_kdm.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_server.rc | 3 | ||||
| -rw-r--r-- | platform/windows/wscript | 6 |
5 files changed, 7 insertions, 11 deletions
diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc index 12747f539..4afb67abd 100644 --- a/platform/windows/dcpomatic.rc +++ b/platform/windows/dcpomatic.rc @@ -1,3 +1,2 @@ -id ICON "../../graphics/dcpomatic2.ico" -taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +id ICON "../../graphics/windows/dcpomatic2.ico" #include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc index de68302de..c775bed21 100644 --- a/platform/windows/dcpomatic_batch.rc +++ b/platform/windows/dcpomatic_batch.rc @@ -1,3 +1,2 @@ -id ICON "../../graphics/dcpomatic2_batch.ico" -taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +id ICON "../../graphics/windows/dcpomatic2_batch.ico" #include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc index e641436c9..2ebaef50a 100644 --- a/platform/windows/dcpomatic_kdm.rc +++ b/platform/windows/dcpomatic_kdm.rc @@ -1,3 +1,2 @@ -id ICON "../../graphics/dcpomatic2_kdm.ico" -taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +id ICON "../../graphics/windows/dcpomatic2_kdm.ico" #include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc index 19da9cfd1..3a036c791 100644 --- a/platform/windows/dcpomatic_server.rc +++ b/platform/windows/dcpomatic_server.rc @@ -1,3 +1,2 @@ -id ICON "../../graphics/dcpomatic2_server.ico" -taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +id ICON "../../graphics/windows/dcpomatic2_server.ico" #include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/wscript b/platform/windows/wscript index 996d8acd0..144696fc7 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -35,9 +35,9 @@ def write_installer(bits, windows_version, dcpomatic_version, debug): print('outFile "%s"' % outfile, file=f) print(""" -!define MUI_ICON "%graphics%/dcpomatic2.ico" -!define MUI_UNICON "%graphics%/dcpomatic2.ico" -!define MUI_SPECIALBITMAP "%graphics%/dcpomatic.bmp" +!define MUI_ICON "%graphics%/windows/dcpomatic2.ico" +!define MUI_UNICON "%graphics%/windows/dcpomatic2.ico" +!define MUI_SPECIALBITMAP "%graphics%/windows/dcpomatic.bmp" !include "Sections.nsh" """, file=f) |