diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-11-15 12:41:36 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-11-15 12:41:36 +0100 |
| commit | 3a5171435d206ca9bc864309c170f5b9bd6c6ff4 (patch) | |
| tree | 48dcd3246d91fab9f20b93e248086071ce7d6048 | |
| parent | 70b8800d19d856eddb6c7c837e62d620e7cc0878 (diff) | |
| parent | 0dd8990a1249721419ae00af60bffc79d9c52920 (diff) | |
| download | mullvadvpn-3a5171435d206ca9bc864309c170f5b9bd6c6ff4.tar.xz mullvadvpn-3a5171435d206ca9bc864309c170f5b9bd6c6ff4.zip | |
Merge branch 'win-fix-dependency-issues'
| -rw-r--r-- | windows/nsis-plugins/nsis-plugins.sln | 3 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/driverlogic/context.cpp | 4 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/pathedit/pathedit.vcxproj | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/windows/nsis-plugins/nsis-plugins.sln b/windows/nsis-plugins/nsis-plugins.sln index 6c2499cf4d..317f568880 100644 --- a/windows/nsis-plugins/nsis-plugins.sln +++ b/windows/nsis-plugins/nsis-plugins.sln @@ -32,6 +32,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tray", "src\tray\tray.vcxpr EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathedit", "src\pathedit\pathedit.vcxproj", "{EF53BD9F-6D69-42BB-8635-958531776283}" + ProjectSection(ProjectDependencies) = postProject + {B52E2D10-A94A-4605-914A-2DCEF6A757EF} = {B52E2D10-A94A-4605-914A-2DCEF6A757EF} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/windows/nsis-plugins/src/driverlogic/context.cpp b/windows/nsis-plugins/src/driverlogic/context.cpp index 4f0cb2d291..33e66da0ab 100644 --- a/windows/nsis-plugins/src/driverlogic/context.cpp +++ b/windows/nsis-plugins/src/driverlogic/context.cpp @@ -172,7 +172,7 @@ std::optional<Context::NetworkAdapter> Context::FindMullvadAdapter(const std::se if (tapAdapters.end() != mullvadAdapter) { - return std::optional{ *mullvadAdapter }; + return { *mullvadAdapter }; } // @@ -191,7 +191,7 @@ std::optional<Context::NetworkAdapter> Context::FindMullvadAdapter(const std::se if (tapAdapters.end() != mullvadAdapter) { - return std::optional{ *mullvadAdapter }; + return { *mullvadAdapter }; } } diff --git a/windows/nsis-plugins/src/pathedit/pathedit.vcxproj b/windows/nsis-plugins/src/pathedit/pathedit.vcxproj index b69cd1e62c..e3a96b743a 100644 --- a/windows/nsis-plugins/src/pathedit/pathedit.vcxproj +++ b/windows/nsis-plugins/src/pathedit/pathedit.vcxproj @@ -70,7 +70,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>iphlpapi.lib;log.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>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>pathedit.def</ModuleDefinitionFile> </Link> @@ -96,7 +96,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories> - <AdditionalDependencies>iphlpapi.lib;log.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>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>pathedit.def</ModuleDefinitionFile> </Link> |