diff --git a/win/setup/scanner/DeliScan2_App_Setup.iss b/win/setup/scanner/DeliScan2_App_Setup.iss index 5a74df3..e74aa8f 100644 --- a/win/setup/scanner/DeliScan2_App_Setup.iss +++ b/win/setup/scanner/DeliScan2_App_Setup.iss @@ -42,9 +42,6 @@ chinese_simp.MyStr3=卸 chinese_simp.MyStr4=请先关闭扫描软件！ [Components] -;Name: "Upgrade"; Description: "Upgrade" ; Types: Full; Languages: english -Name: "Upgrade"; Description: "在线升级功能" ; Types: Full; Languages: chinese_simp -;Name: "Upgrade"; Description: "線上升級功能" ; Types: Full; Languages: chinese_trad Name: "TwainS3000"; Description: "DELI SCAN S3000 TWAIN" ; Types: Full Name: "TwainS2000"; Description: "DELI SCAN S2000 TWAIN" ; Types: Full Name: "TwainDL9000"; Description: "DELI SCAN DL9000 TWAIN" ; Types: Full @@ -65,9 +62,7 @@ Source: "..\..\x86\Qt\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreve Source: "..\..\x86\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\DELI SCAN2.exe"; DestDir: "{app}\"; DestName: "DELI SCAN.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\DLOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\DLUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: not Is64BitInstallMode Source: "..\..\x86\Release\DLFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\DELI SCAN2.exe"; DestDir: "{app}\"; DestName: "DELI SCAN.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode ;Source: "..\..\x86\Release\DLFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -80,7 +75,6 @@ Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{app}\"; Flags: i Source: "..\..\x86\Release\DLBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\DLImgFmt.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\DLImgProc.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\DLVersion.dll"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -99,7 +93,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; app64 Source: "..\..\x64\Release\DLTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\DLTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\iconengines\*"; DestDir: "{app}\iconengines\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -109,9 +102,7 @@ Source: "..\..\x64\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Source: "..\..\x64\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\DELI SCAN2.exe"; DestDir: "{app}\"; DestName: "DELI SCAN.exe"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\DLOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\DLUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: Is64BitInstallMode -Source: "..\..\x64\Release\DLFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +;Source: "..\..\x64\Release\DLFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\ExportFile.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -124,7 +115,6 @@ Source: "..\..\x64\Release\hasp_windows_x64_113819.dll"; DestDir: "{app}\"; Flag Source: "..\..\x64\Release\DLBase.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\DLImgFmt.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\DLImgProc.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\DLVersion.dll"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: Is64BitInstallMode Source: "..\..\x64\Release\HwOcrSdk.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\libmupdf.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\libzip.org.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -140,6 +130,11 @@ Source: "..\..\x64\OEM\deli\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\OEM\deli\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\DLTwainUI.dll"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\DeliScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\VC++\*"; DestDir: "{win}\twain_32\DeliTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -330,7 +325,6 @@ begin [Run] Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64 Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64 -Filename: "{app}\DLUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Deli -desc=install/upgrade"; Components: Upgrade ;Filename: "{app}\DELI SCAN.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=english"; Flags: postinstall nowait skipifsilent; Languages: english Filename: "{app}\DELI SCAN.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp ;Filename: "{app}\DELI SCAN.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese-trad"; Flags: postinstall nowait skipifsilent; Languages: chinese_trad diff --git a/win/setup/scanner/HanvonScan2_App_Setup.iss b/win/setup/scanner/HanvonScan2_App_Setup.iss index 4fa11bb..a1c1673 100644 --- a/win/setup/scanner/HanvonScan2_App_Setup.iss +++ b/win/setup/scanner/HanvonScan2_App_Setup.iss @@ -51,7 +51,6 @@ Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pd ; app32 Source: "..\..\x86\Release\HWTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HWTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\HWOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Qt\iconengines\*"; DestDir: "{app}\iconengines\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -93,8 +92,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; app64 Source: "..\..\x64\Release\HWTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HWTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\HWOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\iconengines\*"; DestDir: "{app}\iconengines\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -133,6 +130,11 @@ Source: "..\..\x64\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignorevers Source: "..\..\x64\OEM\hanvon\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\HWTwainUI.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/HuaGoScan2_App_Setup.iss b/win/setup/scanner/HuaGoScan2_App_Setup.iss index d325eb9..e537fde 100644 --- a/win/setup/scanner/HuaGoScan2_App_Setup.iss +++ b/win/setup/scanner/HuaGoScan2_App_Setup.iss @@ -85,7 +85,6 @@ Source: "..\..\x86\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Source: "..\..\x86\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HuaGoScan2.exe"; DestDir: "{app}\"; DestName: "HuaGoScan.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\HGOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HGUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: not Is64BitInstallMode Source: "..\..\x86\Release\HGFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -118,7 +117,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; app64 Source: "..\..\x64\Release\HGTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HGTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\iconengines\*"; DestDir: "{app}\iconengines\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -128,7 +126,6 @@ Source: "..\..\x64\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Source: "..\..\x64\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HuaGoScan2.exe"; DestDir: "{app}\"; DestName: "HuaGoScan.exe"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\HGOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\HGUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Components: Upgrade; Check: Is64BitInstallMode Source: "..\..\x64\Release\HGFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -159,6 +156,11 @@ Source: "..\..\x64\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignorevers Source: "..\..\x64\OEM\huagao\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\HGTwainUI.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\HuaGoScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/LanxumScan2_App_Setup.iss b/win/setup/scanner/LanxumScan2_App_Setup.iss index a764dce..9246d0c 100644 --- a/win/setup/scanner/LanxumScan2_App_Setup.iss +++ b/win/setup/scanner/LanxumScan2_App_Setup.iss @@ -51,7 +51,6 @@ Source: "..\..\..\..\code_app\doc\scanner\LanxumScan_scanSettings_Help_manual.pd Source: "..\..\x86\Release\update.zip"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\LSCTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\LSCTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\LSCOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -93,8 +92,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Source: "..\..\x64\Release\update.zip"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\LSCTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\LSCTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\LSCOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -133,6 +130,11 @@ Source: "..\..\x64\OEM\lanxum\scanner.dll"; DestDir: "{app}\"; Flags: ignorevers Source: "..\..\x64\OEM\lanxum\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\LSCTwainUI.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\LanxumScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/MicrotekScan2_App_Setup.iss b/win/setup/scanner/MicrotekScan2_App_Setup.iss index 5368869..a63be0b 100644 --- a/win/setup/scanner/MicrotekScan2_App_Setup.iss +++ b/win/setup/scanner/MicrotekScan2_App_Setup.iss @@ -71,7 +71,6 @@ Source: "..\..\x86\Release\microtek-settings\*"; DestDir: "{app}\settings\"; Fla ; app32 Source: "..\..\x86\Release\ZJTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\ZJTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\ZJOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -111,8 +110,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; app64 Source: "..\..\x64\Release\ZJTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\ZJTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\ZJOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -149,6 +146,11 @@ Source: "..\..\x64\OEM\microtek\scanner.dll"; DestDir: "{app}\"; Flags: ignoreve Source: "..\..\x64\OEM\microtek\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\ZJTwainUI.dll"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\MicrotekScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\MicrotekTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/NeuScan2_App_Setup.iss b/win/setup/scanner/NeuScan2_App_Setup.iss index 95ba71b..930c316 100644 --- a/win/setup/scanner/NeuScan2_App_Setup.iss +++ b/win/setup/scanner/NeuScan2_App_Setup.iss @@ -65,7 +65,6 @@ Source: "..\..\x86\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Source: "..\..\x86\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\NeuScan2.exe"; DestDir: "{app}\"; DestName: "NeuScan.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\Release\NEUOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode @@ -96,7 +95,6 @@ Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: ; app64 Source: "..\..\x64\Release\NEUTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\NEUTwainUser.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\hwusbdev.key"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\tessdata\*"; DestDir: "{app}\tessdata\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\iconengines\*"; DestDir: "{app}\iconengines\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -106,7 +104,6 @@ Source: "..\..\x64\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Source: "..\..\x64\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\NeuScan2.exe"; DestDir: "{app}\"; DestName: "NeuScan.exe"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\Release\NEUOCR.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\ExportFile.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -134,6 +131,11 @@ Source: "..\..\x64\OEM\neutral\scanner.dll"; DestDir: "{app}\"; Flags: ignorever Source: "..\..\x64\OEM\neutral\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\NEUTwainUI.dll"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\NeuScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\NeuTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/x86/Release/TWAINDSM.dll b/win/x86/Release/TWAINDSM.dll new file mode 100644 index 0000000..fdaf886 Binary files /dev/null and b/win/x86/Release/TWAINDSM.dll differ