Merge branch 'fix-wg-header' into main

mullvad · Apr 18, 2024 · 39afae6 · 39afae6
2 parents b9ddc24 + c80d2d3
commit 39afae6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git 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
diff --git 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
@@ -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>
diff --git 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 → windows/driverlogic/src/wireguard.h b/windows/driverlogic/src/wireguard_dll.h → 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"