summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-09-18 00:21:09 +0100
committerCarl Hetherington <cth@carlh.net>2012-09-18 00:21:09 +0100
commit48794870183ac5c0dd2b4acc1f9c2e5d7349f284 (patch)
tree1fd791507967788dd39d1dc46abd2d7c9c102e68 /windows
parent1e8f1be709e8a3fa58f1147db2e58a39396313d8 (diff)
Basics of a tray-iconned GUI server.
Diffstat (limited to 'windows')
-rw-r--r--windows/dvdomatic.rc3
-rw-r--r--windows/dvdomatic_taskbar.icobin0 -> 1150 bytes
-rw-r--r--windows/installer.nsi.in3
3 files changed, 4 insertions, 2 deletions
diff --git a/windows/dvdomatic.rc b/windows/dvdomatic.rc
index e6ce66597..97bfac229 100644
--- a/windows/dvdomatic.rc
+++ b/windows/dvdomatic.rc
@@ -1,2 +1,3 @@
-#include "wx-2.8/wx/msw/wx.rc"
id ICON "dvdomatic.ico"
+taskbar_icon ICON "dvdomatic_taskbar.ico"
+#include "wx-2.8/wx/msw/wx.rc"
diff --git a/windows/dvdomatic_taskbar.ico b/windows/dvdomatic_taskbar.ico
new file mode 100644
index 000000000..f4489fa14
--- /dev/null
+++ b/windows/dvdomatic_taskbar.ico
Binary files differ
diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index d34258799..3fb2ae457 100644
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -84,7 +84,8 @@ File "%deps%/bin/libxml2-2.dll"
File "%binaries%/src/wx/dvdomatic-wx.dll"
File "%binaries%/src/lib/dvdomatic.dll"
File "%binaries%/src/tools/dvdomatic.exe"
-File "%binaries%/src/tools/servomatic.exe"
+File "%binaries%/src/tools/servomatic_cli.exe"
+File "%binaries%/src/tools/servomatic_gui.exe"
CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""