diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-04-18 15:02:53 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-04-18 15:02:53 +0200 |
| commit | 39afae6606a16747d6f4d044273db3f050fc37e6 (patch) | |
| tree | c9acdb07ac512eba8dc6f64fb1ddafbb63188540 | |
| parent | b9ddc240e7dab2c81aa32acfff179aee6665beac (diff) | |
| parent | c80d2d35b33f367bf4aec014c3751663b616fb04 (diff) | |
| download | mullvadvpn-39afae6606a16747d6f4d044273db3f050fc37e6.tar.xz mullvadvpn-39afae6606a16747d6f4d044273db3f050fc37e6.zip | |
Merge branch 'fix-wg-header' into main
| -rw-r--r-- | .github/workflows/daemon.yml | 4 | ||||
| m--------- | dist-assets/binaries | 0 | ||||
| -rw-r--r-- | windows/driverlogic/driverlogic.vcxproj | 6 | ||||
| -rw-r--r-- | windows/driverlogic/driverlogic.vcxproj.filters | 2 | ||||
| -rw-r--r-- | windows/driverlogic/src/driverlogic.cpp | 2 | ||||
| -rw-r--r-- | windows/driverlogic/src/wireguard.h (renamed from windows/driverlogic/src/wireguard_dll.h) | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index a5107fbcf8..3293e02879 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -114,10 +114,6 @@ jobs: - name: Checkout submodules run: git submodule update --init --depth=1 - - name: Checkout wireguard-nt - working-directory: dist-assets/binaries - run: git submodule update --init -- wireguard-nt - - name: Install Protoc uses: arduino/setup-protoc@v1 with: diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject d9edc48af33db4afbcb8d6c7754e1dfe963d517 +Subproject 7db2c76522e29b4acd8f461fc87f794954c6df9 diff --git a/windows/driverlogic/driverlogic.vcxproj b/windows/driverlogic/driverlogic.vcxproj index ab9e6c19b5..c68d0568ab 100644 --- a/windows/driverlogic/driverlogic.vcxproj +++ b/windows/driverlogic/driverlogic.vcxproj @@ -61,7 +61,7 @@ <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../dist-assets/binaries/wireguard-nt/api/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <LanguageStandard>stdcpp20</LanguageStandard> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> @@ -83,7 +83,7 @@ <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ConformanceMode>true</ConformanceMode> <LanguageStandard>stdcpp20</LanguageStandard> - <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../dist-assets/binaries/wireguard-nt/api/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> @@ -115,7 +115,7 @@ <ClInclude Include="src\targetver.h" /> <ClInclude Include="src\util.h" /> <ClInclude Include="src\wintun.h" /> - <ClInclude Include="src\wireguard_dll.h" /> + <ClInclude Include="src\wireguard.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/windows/driverlogic/driverlogic.vcxproj.filters b/windows/driverlogic/driverlogic.vcxproj.filters index fae74cfdee..bd73d30029 100644 --- a/windows/driverlogic/driverlogic.vcxproj.filters +++ b/windows/driverlogic/driverlogic.vcxproj.filters @@ -26,6 +26,6 @@ <ClInclude Include="src\util.h" /> <ClInclude Include="src\wintun.h" /> <ClInclude Include="src\devenum.h" /> - <ClInclude Include="src\wireguard_dll.h" /> + <ClInclude Include="src\wireguard.h" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/windows/driverlogic/src/driverlogic.cpp b/windows/driverlogic/src/driverlogic.cpp index 795960b6d2..7cd8cf5f51 100644 --- a/windows/driverlogic/src/driverlogic.cpp +++ b/windows/driverlogic/src/driverlogic.cpp @@ -4,7 +4,7 @@ #include "service.h" #include "log.h" #include "wintun.h" -#include "wireguard_dll.h" +#include "wireguard.h" #include "devenum.h" #include <string> #include <libcommon/error.h> diff --git a/windows/driverlogic/src/wireguard_dll.h b/windows/driverlogic/src/wireguard.h index 7260ce5b4d..e99da56c05 100644 --- a/windows/driverlogic/src/wireguard_dll.h +++ b/windows/driverlogic/src/wireguard.h @@ -1,6 +1,6 @@ #pragma once -#include <wireguard.h> +#include <wireguard-nt/wireguard.h> #include <libcommon/error.h> #include "util.h" |