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 8bea81af0d874bcee63611b220bffdc19319bfd6..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"
@@ -35,30 +35,23 @@ File "%deps%/bin/avutil-51.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/intl.dll"
 File "%deps%/bin/kumu-libdcp.dll"
-File "%deps%/bin/libatkmm-1.6-1.dll"
 File "%deps%/bin/libboost_chrono-mt.dll"
 File "%deps%/bin/libboost_filesystem-mt.dll"
 File "%deps%/bin/libboost_system-mt.dll"
 File "%deps%/bin/libboost_thread_win32-mt.dll"
-File "%deps%/bin/libcairomm-1.0-1.dll"
 File "%deps%/bin/libeay32.dll"
 File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgdk-win32-2.0-0.dll"
-File "%deps%/bin/libgdkmm-2.4-1.dll"
 File "%deps%/bin/libgdk_pixbuf-2.0-0.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
-File "%deps%/bin/libgiomm-2.4-1.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
-File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
 File "%deps%/bin/libgtk-win32-2.0-0.dll"
-File "%deps%/bin/libgtkmm-2.4-1.dll"
 File "%deps%/bin/libjpeg-7.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpangomm-1.4-1.dll"
 File "%deps%/bin/libpng14-14.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
@@ -68,24 +61,30 @@ File "%deps%/bin/postproc-52.dll"
 File "%deps%/bin/swresample-0.dll"
 File "%deps%/bin/swscale-2.dll"
 File "%deps%/bin/zlib1.dll"
-File "%deps%/libjpeg-8.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/gtk/dvdomatic-gtk.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" ""
  
@@ -112,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