Include servomatic in the windows install.

[dcpomatic.git] / windows / installer.nsi.in

diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index 1c7294c655baa573ae3fdbbba79044678ef8bebb..d342587993ff93bf88c907d5742d6b1859411bf9 100644 (file)
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -1,7 +1,7 @@
 !include "MUI2.nsh"
 Name "DVD-o-matic"
 
-RequestExecutionLevel user
+RequestExecutionLevel admin
 
 outFile "DVD-o-matic @version@ Installer.exe"
 !define MUI_ICON "%resources%/dvdomatic.ico"
@@ -64,23 +64,27 @@ File "%deps%/bin/zlib1.dll"
 File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/wxbase28_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
+File "%deps%/bin/libcairo-2.dll"
+File "%deps%/bin/libfontconfig-1.dll"
+File "%deps%/bin/libexpat-1.dll"
+File "%deps%/bin/freetype6.dll"
+File "%deps%/bin/libgthread-2.0-0.dll"
+File "%deps%/bin/libpango-1.0-0.dll"
+File "%deps%/bin/libgmodule-2.0-0.dll"
+File "%deps%/bin/libpangocairo-1.0-0.dll"
+File "%deps%/bin/libpangoft2-1.0-0.dll"
+File "%deps%/bin/libpangowin32-1.0-0.dll"
+File "%deps%/bin/libtiff3.dll"
+File "%deps%/bin/jpeg62.dll"
+File "%deps%/bin/libglibmm-2.4-1.dll"
+File "%deps%/bin/libxml++-2.6-2.dll"
+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"
-
-CreateDirectory "$INSTDIR\etc\gtk-2.0"
-SetOutPath "$INSTDIR\etc\gtk-2.0"
-File "%deps%/etc/gtk-2.0/im-multipress.conf"
-File "%deps%/etc/gtk-2.0/gtkrc"
-File "%deps%/etc/gtk-2.0/gtk.immodules"
-
-CreateDirectory "$INSTDIR\etc\pango"
-SetOutPath "$INSTDIR\etc\pango"
-File "%deps%/etc/pango/pango.modules"
-
-SetOutPath "$PROFILE"
-File "%resources%/.gtkrc-2.0"
+File "%binaries%/src/tools/servomatic.exe"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
  
@@ -107,4 +111,3 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
  
 SectionEnd
- 
\ No newline at end of file