adapt windows installers

apps/installer/CUDA-dll.iss

 #define cuda_io_dir "..\bin\x64\release\core_plugins_cuda"
 #define cuda_plugin_dir "core_plugins_cuda"
 
-#define cuda_version GetEnv('CUDA_VERSION')
-#define cuda_dir GetEnv('CUDA_INSTALL')
-#define cuda_path cuda_dir + "\v" + cuda_version
+#define cuda_path "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.0"
 
 #define programfiles GetEnv('ProgramW6432')
 #define nvsmi_dir programfiles + "\NVIDIA CORPORATION\NVSMI"
 
 ; CUDA dependencies
-Source: "{#cuda_path}\bin\cudart64_80.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#cuda_path}\bin\cudart64_100.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; NVML dependency
 Source: "{#nvsmi_dir}\nvml.dll"; DestDir: "{app}"; Flags: ignoreversion

apps/installer/VideoStitch64_studio.iss

@@ -52,9 +52,6 @@ Name: "{group}\{#batchName}"; Filename: "{app}\{#batch}"; IconFilename: "{app}\{
 ;Name: "{group}\Uninstall {#MyAppName}"; Filename: "{uninstallexe}" ; create a shortcut in the startmenu
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#ExeName}"; WorkingDir: {app}; Tasks: desktopicon
 
-[Run]
-Filename: "{app}\vcredist_x64_2013.exe"; Parameters: "/q /norestart"; WorkingDir: "{app}"; StatusMsg: "Installing Microsoft Visual C++ 2013 Redistributable Package (x64)"
-
 [Tasks]
 Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
 

apps/installer/VideoStitch64_vahanaVR.iss

@@ -43,57 +43,25 @@ Source: "installer\examples\*.vah"; DestDir: "{%HOMEPATH}\{#MyAppName}\Projects"
 Source: "{#vah_dir}\decklink.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 Source: "{#vah_dir}\magewell.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 Source: "{#vah_dir}\magewellpro.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
-Source: "{#vah_dir}\aja_64.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 Source: "{#vah_dir}\rtmp.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 Source: "{#vah_dir}\portaudio.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 Source: "{#vah_dir}\ximea_64.dll"; DestDir: "{app}\{#vah_plugin_dir}"; Flags: ignoreversion
 
 ; Magewell dependencies
-Source: "{#bin_dir}\LibXIProperty.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\LibXIStream2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\LibMWCapture.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-;AJA CORVID88 NTV2 dependencies
-Source: "{#bin_dir}\ajastuffdll_64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\classesDLL_64.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-; Point Gray & Ladybug dependencies
-;Source: "installer\vcredist_x64_2010.exe"; DestDir: "{app}"; Flags: deleteafterinstall ignoreversion
-;Source: "{#bin_dir}\ActiveFlyCap_v100.dll"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "{#bin_dir}\FlyCapture2_v100.dll"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "{#bin_dir}\libiomp5md.dll"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "{#bin_dir}\ladybug.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Windows\System32\LibXIProperty.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Windows\System32\LibXIStream2.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Windows\System32\LibMWCapture.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; Ximea dependencies
-Source: "{#bin_dir}\vcredist_x64_2012.exe"; DestDir: "{app}"; Flags: deleteafterinstall ignoreversion
-;Source: "{#bin_dir}\xi4Api_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\xiapi64.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-; rtmp dependencies
-Source: "{#bin_dir}\librtmp.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\librtmp-1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libx264-148.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libmp3lame-0.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-; rtmp and Youtube output dependencies
-Source: "{#bin_dir}\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\dev\XIMEA\vcredist_2013_x64.exe"; DestDir: "{app}"; Flags: deleteafterinstall ignoreversion
+Source: "D:\dev\XIMEA\API\x64\xiapi64.dll"; DestDir: "{app}"; Flags: ignoreversion
 
-; Youtube output dependencies
-Source: "{#bin_dir}\roots.pem"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libglog.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#ExeName}"; IconFilename: "{app}\{#ExeName}"
-;Name: "{group}\Uninstall {#MyAppName}"; Filename: "{uninstallexe}" ; create a shortcut in the startmenu
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#ExeName}"; Tasks: desktopicon
 
 [Run]
-;Filename: "{app}\vcredist_x64_2010.exe"; Parameters: "/q /norestart"; StatusMsg: "Installing Microsoft Visual C++ 2010 Redistributable Package (x64)"
-Filename: "{app}\vcredist_x64_2012.exe"; Parameters: "/q /norestart"; StatusMsg: "Installing Microsoft Visual C++ 2012 Redistributable Package (x64)"
-Filename: "{app}\vcredist_x64_2013.exe"; Parameters: "/q /norestart"; StatusMsg: "Installing Microsoft Visual C++ 2013 Redistributable Package (x64)"
 Filename: {app}\{#ExeName}; Description: "Launch {#MyAppName}"; Flags: nowait postinstall skipifsilent runascurrentuser
 
 [Tasks]

apps/installer/common-dll.iss

-#define qt_version GetEnv('QT_VERSION')
-#define qt_dir GetEnv('QT_INSTALL')
-#define qt_dir_v qt_dir + "\" + qt_version + "\msvc2013_64"
+#define qt_dir_v "D:\dev\Qt\5.12.5\msvc2017_64"
 #define qt_bin qt_dir_v + "\bin"
 #define qt_platform qt_dir_v + "\plugins\platforms"
 #define qt_format qt_dir_v + "\plugins\imageformats"
 #define qt_audio qt_dir_v + "\plugins\audio"
-
-; rtmp dependencies
-Source: "{#bin_dir}\libwinpthread-1.dll"; DestDir: "{app}"; Flags: ignoreversion
+#define vcpkg_dir "D:\dev\vcpkg\installed\x64-windows\bin"
 
 ; other I/O dependencies
-Source: "{#bin_dir}\libtiff-5.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\turbojpeg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\openvr_api.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\portaudio_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\tiff.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\turbojpeg.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\openvr_api.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\portaudio_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; qt dependencies
 Source: "{#qt_bin}\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -37,15 +33,16 @@ Source: "{#qt_platform}\qoffscreen.dll"; DestDir: "{app}\platforms"; Flags: recu
 Source: "{#qt_platform}\qwindows.dll"; DestDir: "{app}\platforms"; Flags: recursesubdirs ignoreversion
 
 ; Ceres dependencies
-Source: "{#bin_dir}\ceres.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\ceres.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\glog.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; OpenCV dependencies
-Source: "{#bin_dir}\opencv_calib3d310.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\opencv_core310.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\opencv_features2d310.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\opencv_imgproc310.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\opencv_flann310.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\opencv_video310.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_calib3d.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_core.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_features2d.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_imgproc.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_flann.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\opencv_video.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; VideoStitch internals
 Source: "{#bin_dir}\libvideostitch-gpudiscovery.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -53,20 +50,20 @@ Source: "{#bin_dir}\libvideostitch.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#bin_dir}\libvideostitch-gui.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#bin_dir}\libvideostitch-base.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#bin_dir}\{#ExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\vcredist_x64_2013.exe"; DestDir: "{app}"; Flags: deleteafterinstall ignoreversion
 
 ; rtmp dependencies
-Source: "{#bin_dir}\librtmp.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\librtmp-1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libx264-148.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libmp3lame.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\librtmp.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\libx264-157.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\libmp3lame.dll"; DestDir: "{app}"; Flags: ignoreversion
 
 ; ffmpeg dependencies
-Source: "{#bin_dir}\avcodec-57.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\avformat-57.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\avresample-3.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\avutil-55.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#bin_dir}\libx264-146.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\avcodec-58.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\avformat-58.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\avresample-4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#vcpkg_dir}\avutil-56.dll"; DestDir: "{app}"; Flags: ignoreversion
+
+Source: "D:\dev\Visual Studio 2017\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64\vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\dev\Visual Studio 2017\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64\msvcp140.dll"; DestDir: "{app}"; Flags: ignoreversion
\ No newline at end of file

apps/installer/core-plugins-dll.iss

@@ -3,4 +3,3 @@
 
 Source: "{#io_dir}\jpg.dll"; DestDir: "{app}\{#plugin_dir}"; Flags: ignoreversion
 Source: "{#io_dir}\png.dll"; DestDir: "{app}\{#plugin_dir}"; Flags: ignoreversion
-Source: "{#io_dir}\tiff.dll"; DestDir: "{app}\{#plugin_dir}"; Flags: ignoreversion

apps/installer/gen_studio_installer.sh

@@ -18,7 +18,6 @@ fi
 array=("..\..\bin\x64\Release\batchstitcher.exe" "..\..\bin\x64\Release\videostitch-studio.exe" "..\..\bin\x64\Release\videostitch-cmd.exe")
 for exe in "${array[@]}" ; do
 	verpatch.exe /va $exe $vsver4 /pv $vsver4 /s desc "VideoStitch Studio" /s copyright "Copyright VideoStitch SAS 2017" /s product "VideoStitch Studio"
-	./sign.bat $exe
 done
 
 #generate installer			  

apps/installer/gen_vahanaVR_installer.sh

@@ -17,7 +17,6 @@ fi
 #set details and sign executables
 exe="..\..\bin\x64\Release\VahanaVR.exe"
 verpatch.exe /va $exe $vsver4 /pv $vsver4 /s desc "Vahana VR" /s copyright "Copyright VideoStitch SAS 2017" /s product "Vahana VR"
-./sign.bat $exe
 
 #generate installer			  
 sed -e "s/__APPVERSION__/$vsver/g" -e "s/__INFOVERSION__/$vsver3/g" -e "s/__GPU__/$1/g" -e "s/__OTHER_GPU__/$optionalGpu/g" VideoStitch64_vahanaVR.iss > tmp.iss