GraphicsMagick: Prepare installation script for MSVC2013 runtime.
GraphicsMagick Commits <[email protected]> Tue, 22 Aug 2023 17:04:46 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.10922.1692741907.1374.graphicsmagick-commit@lists.sourceforge.net> |
changeset 59024f8dd9fc in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=59024f8dd9fc summary: Prepare installation script for MSVC2013 runtime. diffstat: ChangeLog | 5 +++++ VisualMagick/installer/gm-win64-Q8-dll.iss | 3 ++- VisualMagick/installer/inc/body.isx | 25 ++++++++++++++++++------- VisualMagick/installer/inc/files-dlls.isx | 6 +++++- 4 files changed, 30 insertions(+), 9 deletions(-) diffs (77 lines): diff -r 97f0adcf6269 -r 59024f8dd9fc ChangeLog --- a/ChangeLog Tue Aug 22 00:17:14 2023 +0200 +++ b/ChangeLog Wed Aug 23 00:04:14 2023 +0200 @@ -1,3 +1,8 @@ +2023-08-23 Fojtik Jaroslav <[email protected]> + * VisualMagick\installer\inc\files-dlls.isx + * VisualMagick\installer\inc\body.isx + Prepare installation script for MSVC2013 runtime. + 2023-08-22 Fojtik Jaroslav <[email protected]> * VisualMagick\installer\inc\files-dlls.isx * VisualMagick\installer\inc\body.isx diff -r 97f0adcf6269 -r 59024f8dd9fc VisualMagick/installer/gm-win64-Q8-dll.iss --- a/VisualMagick/installer/gm-win64-Q8-dll.iss Tue Aug 22 00:17:14 2023 +0200 +++ b/VisualMagick/installer/gm-win64-Q8-dll.iss Wed Aug 23 00:04:14 2023 +0200 @@ -14,7 +14,8 @@ #define public QuantumDepth "8" #define public WIN64 1 #define public InstallPerlMagick 0 -;#define public VC_2010 +;#define public VC_2010 +;#define public VC_2013 #include "inc\body.isx" diff -r 97f0adcf6269 -r 59024f8dd9fc VisualMagick/installer/inc/body.isx --- a/VisualMagick/installer/inc/body.isx Tue Aug 22 00:17:14 2023 +0200 +++ b/VisualMagick/installer/inc/body.isx Wed Aug 23 00:04:14 2023 +0200 @@ -196,14 +196,25 @@ #endif r3 := r1; #else - #ifdef WIN64 - r1 := VCVersionInstalled(VC_2008_REDIST_X64); - r2 := VCVersionInstalled(VC_2008_SP1_REDIST_X64); - r3 := VCVersionInstalled(VC_2008_SP1_MFC_SEC_UPD_REDIST_X64); + #ifdef VC_2013 + #ifdef WIN64 + r1 := VCVersionInstalled(VC_2013_REDIST_X64); + r2 := VCVersionInstalled(VC_2013_REDIST_X64_); + #else + r1 := VCVersionInstalled(VC_2013_REDIST_X86); + r2 := VCVersionInstalled(VC_2013_REDIST_X86_); + #endif + r3 := r1; #else - r1 := VCVersionInstalled(VC_2008_REDIST_X86); - r2 := VCVersionInstalled(VC_2008_SP1_REDIST_X86_); - r3 := VCVersionInstalled(VC_2008_SP1_MFC_SEC_UPD_REDIST_X86); + #ifdef WIN64 + r1 := VCVersionInstalled(VC_2008_REDIST_X64); + r2 := VCVersionInstalled(VC_2008_SP1_REDIST_X64); + r3 := VCVersionInstalled(VC_2008_SP1_MFC_SEC_UPD_REDIST_X64); + #else + r1 := VCVersionInstalled(VC_2008_REDIST_X86); + r2 := VCVersionInstalled(VC_2008_SP1_REDIST_X86_); + r3 := VCVersionInstalled(VC_2008_SP1_MFC_SEC_UPD_REDIST_X86); + #endif #endif #endif Result := not ((r1 and r2) or r3); diff -r 97f0adcf6269 -r 59024f8dd9fc VisualMagick/installer/inc/files-dlls.isx --- a/VisualMagick/installer/inc/files-dlls.isx Tue Aug 22 00:17:14 2023 +0200 +++ b/VisualMagick/installer/inc/files-dlls.isx Wed Aug 23 00:04:14 2023 +0200 @@ -15,7 +15,11 @@ #ifdef VC_2010 Source: "redist\VC2010SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall #else - Source: "redist\VC2008SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall + #ifdef VC_2013 + Source: "redist\VC2013\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall + #else + Source: "redist\VC2008SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall + #endif #endif #else #define public CPUARCH "x86"