X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=windows%2Finstaller.nsi.in;h=3fb2ae4579bbb5eaada17f8e13e8795736ff459c;hb=48794870183ac5c0dd2b4acc1f9c2e5d7349f284;hp=4f8a53abe9ae3c0168a6d9554a911847416a738d;hpb=7f90438d5578ef354a26adbf04641dc10a434eee;p=dcpomatic.git

diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index 4f8a53abe..3fb2ae457 100644
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -1,12 +1,12 @@
 !include "MUI2.nsh"
 Name "DVD-o-matic"
 
-RequestExecutionLevel user
+RequestExecutionLevel admin
 
-outFile "DVD-o-matic @version@.exe"
-!define MUI_ICON "dvdomatic.ico"
-!define MUI_UNICON "dvdomatic.ico"
-!define MUI_SPECIALBITMAP "dvdomatic.bmp"
+outFile "DVD-o-matic @version@ Installer.exe"
+!define MUI_ICON "%resources%/dvdomatic.ico"
+!define MUI_UNICON "%resources%/dvdomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
 
 InstallDir "$PROGRAMFILES\DVD-o-matic"
 
@@ -27,66 +27,71 @@ Section "install" "Installation info"
  
 SetOutPath "$INSTDIR\bin"
 
-File "bin/asdcp-libdcp.dll"
-File "bin/avcodec-54.dll"
-File "bin/avfilter-3.dll"
-File "bin/avformat-54.dll"
-File "bin/avutil-51.dll"
-File "bin/dcp.dll"
-File "bin/dvdomatic-gtk.dll"
-File "bin/dvdomatic.dll"
-File "bin/dvdomatic.exe"
-File "bin/intl.dll"
-File "bin/kumu-libdcp.dll"
-File "bin/libatkmm-1.6-1.dll"
-File "bin/libboost_chrono-mt.dll"
-File "bin/libboost_filesystem-mt.dll"
-File "bin/libboost_system-mt.dll"
-File "bin/libboost_thread_win32-mt.dll"
-File "bin/libcairomm-1.0-1.dll"
-File "bin/libeay32.dll"
-File "bin/libgcc_s_sjlj-1.dll"
-File "bin/libgdk-win32-2.0-0.dll"
-File "bin/libgdkmm-2.4-1.dll"
-File "bin/libgdk_pixbuf-2.0-0.dll"
-File "bin/libgio-2.0-0.dll"
-File "bin/libgiomm-2.4-1.dll"
-File "bin/libglib-2.0-0.dll"
-File "bin/libglibmm-2.4-1.dll"
-File "bin/libgobject-2.0-0.dll"
-File "bin/libgtk-win32-2.0-0.dll"
-File "bin/libgtkmm-2.4-1.dll"
-File "bin/libjpeg-7.dll"
-File "bin/libMagick++-5.dll"
-File "bin/libMagickCore-5.dll"
-File "bin/libMagickWand-5.dll"
-File "bin/libopenjpeg-1.dll"
-File "bin/libpangomm-1.4-1.dll"
-File "bin/libpng14-14.dll"
-File "bin/libsigc-2.0-0.dll"
-File "bin/libsndfile-1.dll"
-File "bin/libssh.dll"
-File "bin/libstdc++-6.dll"
-File "bin/postproc-52.dll"
-File "bin/swresample-0.dll"
-File "bin/swscale-2.dll"
-File "bin/zlib1.dll"
+File "%deps%/bin/asdcp-libdcp.dll"
+File "%deps%/bin/avcodec-54.dll"
+File "%deps%/bin/avfilter-3.dll"
+File "%deps%/bin/avformat-54.dll"
+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/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/libeay32.dll"
+File "%deps%/bin/libgcc_s_sjlj-1.dll"
+File "%deps%/bin/libgdk-win32-2.0-0.dll"
+File "%deps%/bin/libgdk_pixbuf-2.0-0.dll"
+File "%deps%/bin/libgio-2.0-0.dll"
+File "%deps%/bin/libglib-2.0-0.dll"
+File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libgtk-win32-2.0-0.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/libpng14-14.dll"
+File "%deps%/bin/libsigc-2.0-0.dll"
+File "%deps%/bin/libsndfile-1.dll"
+File "%deps%/bin/libssh.dll"
+File "%deps%/bin/libstdc++-6.dll"
+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%/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"
 
-CreateDirectory "$INSTDIR\etc\gtk-2.0"
-SetOutPath "$INSTDIR\etc\gtk-2.0"
-File "etc/gtk-2.0/im-multipress.conf"
-File "etc/gtk-2.0/gtkrc"
-File "etc/gtk-2.0/gtk.immodules"
-
-CreateDirectory "$INSTDIR\etc\pango"
-SetOutPath "$INSTDIR\etc\pango"
-File "etc/pango/pango.modules"
+File "%binaries%/src/wx/dvdomatic-wx.dll"
+File "%binaries%/src/lib/dvdomatic.dll"
+File "%binaries%/src/tools/dvdomatic.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" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\dvdomatic.exe" "" "$INSTDIR\dvdomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
  
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
@@ -107,4 +112,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