diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-04-01 18:11:06 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-04-01 18:11:06 +0200 |
| commit | 9252bbdde62db9db5d564b785fbaac14220d085a (patch) | |
| tree | e4de462bbfcbca17e91530d5dde210d1d4e380f9 | |
| parent | 33c7666cc6d03b393b4e003c04c4ca1d3a4ff5cc (diff) | |
| parent | efdb7a1a8a764a3c123d246b5fa0eea347ff5566 (diff) | |
| download | mullvadvpn-9252bbdde62db9db5d564b785fbaac14220d085a.tar.xz mullvadvpn-9252bbdde62db9db5d564b785fbaac14220d085a.zip | |
Merge branch 'fix-logger-plugin-deps'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/log/log.vcxproj | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f30f5b1c1..41593d5d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,9 @@ Line wrap the file at 100 chars. Th ### Added - When IPv6 is enabled, get both exit IP versions from am.i.mullvad.net and show in UI. +### Fixed +#### Windows +- Correct dependencies on installer logger plugin to resolve installation issues on Windows 7/8. ## [2019.2] - 2019-03-28 ### Removed diff --git a/windows/nsis-plugins/src/log/log.vcxproj b/windows/nsis-plugins/src/log/log.vcxproj index 31c45bd46e..71f474332c 100644 --- a/windows/nsis-plugins/src/log/log.vcxproj +++ b/windows/nsis-plugins/src/log/log.vcxproj @@ -70,7 +70,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/windows/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>mincore.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>version.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>log.def</ModuleDefinitionFile> </Link> @@ -96,7 +96,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/windows/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>mincore.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>version.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile>log.def</ModuleDefinitionFile> </Link> |