Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: include arm64 in amd64

Browse Source 
ARM64 will still run AMD64 apps.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-11-05 16:34:00 +01:00
parent 9f3d466791
commit c891e84259
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/entry.h
View File

@ -8,7 +8,7 @@
#include <Windows.h> #include <Windows.h>
/* TODO: Replace with is_defined. MSVC has issues with the linux kernel varadic macro trick for this. */ /* TODO: Replace with is_defined. MSVC has issues with the linux kernel varadic macro trick for this. */
#if defined(_M_IX86) || defined(_M_ARM) #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
# define MAYBE_WOW64 1 # define MAYBE_WOW64 1
#else #else
# define MAYBE_WOW64 0 # define MAYBE_WOW64 0

2
api/resources.rc
View File

@ -19,7 +19,7 @@ wintun-whql.sys RCDATA "whql\\wintun.sys"
#if defined(_M_IX86) #if defined(_M_IX86)
wintun-amd64.dll RCDATA "amd64\\wintun.dll" wintun-amd64.dll RCDATA "amd64\\wintun.dll"
#endif #endif
#if defined(_M_IX86) || defined(_M_ARM) #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
wintun-arm64.dll RCDATA "arm64\\wintun.dll" wintun-arm64.dll RCDATA "arm64\\wintun.dll"
#endif #endif

3
wintun.proj
View File

@ -83,7 +83,8 @@
<MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" /> <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" />
</Target> </Target>
<Target Name="Dll-amd64" <Target Name="Dll-amd64"
Outputs="$(Configuration)\amd64\wintun.dll"> Outputs="$(Configuration)\amd64\wintun.dll"
DependsOnTargets="Dll-arm64">
<MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" /> <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" />
</Target> </Target>
<Target Name="Dll-arm" <Target Name="Dll-arm"