Use environment variable to resolve Visual C++ Redistributable

DavidGregory084 · Jan 25, 2021 · c8f4a18 · c8f4a18
1 parent a82f029
commit c8f4a18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -100,11 +100,6 @@ test_script:
   - cmd: cd %APPVEYOR_BUILD_FOLDER%\physfs_rts
   - cmd: cargo test
 
-  # SFS repacker
-  #
-  - cmd: cd %APPVEYOR_BUILD_FOLDER%\repacker
-  - cmd: cargo test
-
   # Java PhysFS library
   #
   - cmd: cd %APPVEYOR_BUILD_FOLDER%

diff --git a/installer/openil2-debug.iss b/installer/openil2-debug.iss
@@ -1,6 +1,12 @@
 #define MyAppName "OpenIL2 (Debug Build)"
 #define MyAppVersion GetEnv('RELEASE_VERSION')
 #define MyAppExeName "openil2.exe"
+#define VisualCppDir GetEnv('VCINSTALLDIR')
+#if GetEnv('VCINSTALLDIR') != ""
+#define VisualCppDir GetEnv('VCINSTALLDIR')
+#else
+#define VisualCppDir "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\"
+#endif
 
 [Setup]
 AppId={{0C8CF246-19D7-4DDD-8836-9242E2EBDBA2}
@@ -47,7 +53,7 @@ Source: "..\jre_debug\*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdir
 Source: "..\sfs_db.sqlite"; DestDir: "{app}"; Flags: ignoreversion
 ; fb_3do10.SFS - No identified entries as yet so we need to provide a dummy .zip with at least one entry
 Source: "fb_3do10p.zip"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\v142\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "{#VisualCppDir}Redist\MSVC\v142\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Run]
 Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "Installing Visual C++ 2019 Redistributable"

diff --git a/installer/openil2.iss b/installer/openil2.iss
@@ -1,6 +1,11 @@
 #define MyAppName "OpenIL2"
 #define MyAppVersion GetEnv('RELEASE_VERSION')
 #define MyAppExeName "openil2.exe"
+#if GetEnv('VCINSTALLDIR') != ""
+#define VisualCppDir GetEnv('VCINSTALLDIR')
+#else
+#define VisualCppDir "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\"
+#endif
 
 [Setup]
 AppId={{39EF55F9-0664-43CC-A3A2-7780264F1184}
@@ -47,7 +52,7 @@ Source: "..\jre\*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "..\sfs_db.sqlite"; DestDir: "{app}"; Flags: ignoreversion
 ; fb_3do10.SFS - No identified entries as yet so we need to provide a dummy .zip with at least one entry
 Source: "fb_3do10p.zip"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\v142\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "{#VisualCppDir}Redist\MSVC\v142\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Run]
 Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/install /quiet /norestart"; StatusMsg: "Installing Visual C++ 2019 Redistributable"