diff --git a/.gitignore b/.gitignore index a1a09be..c154272 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ *.vhd *.zip arm +aa64 ia32 image x64 diff --git a/.vs/msvc/affs.vcxproj b/.vs/msvc/affs.vcxproj index 735cee5..b8d70ea 100644 --- a/.vs/msvc/affs.vcxproj +++ b/.vs/msvc/affs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {984927FE-DDE3-4BD6-B289-F8E49A1204B8} affs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,8 +167,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,11 +180,10 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true - EFI Runtime + EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) @@ -176,8 +194,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -195,7 +211,7 @@ false true - EFI Runtime + EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) @@ -206,8 +222,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,11 +235,37 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="Amiga FFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true - EFI Runtime + EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) @@ -238,6 +278,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,13 +288,10 @@ true - - - - + false true - EFI Runtime + EFI Boot Service Driver gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) /IGNORE:4210 %(AdditionalOptions) @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,13 +317,10 @@ true - - - - + false true - EFI Runtime + EFI Boot Service Driver gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) /IGNORE:4210 %(AdditionalOptions) @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,13 +346,39 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="Amiga FFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true - EFI Runtime + EFI Boot Service Driver gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) /IGNORE:4210 %(AdditionalOptions) diff --git a/.vs/msvc/affs.vcxproj.user b/.vs/msvc/affs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/affs.vcxproj.user +++ b/.vs/msvc/affs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/bfs.vcxproj b/.vs/msvc/bfs.vcxproj index e3c793a..413c060 100644 --- a/.vs/msvc/bfs.vcxproj +++ b/.vs/msvc/bfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {D085632B-FEE9-4126-A6ED-030E88F4B8A3} bfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,8 +167,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -176,8 +194,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -206,8 +222,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,34 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="BFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -238,6 +278,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +288,7 @@ true - - - - + false true EFI Boot Service Driver @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="BFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/bfs.vcxproj.user b/.vs/msvc/bfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/bfs.vcxproj.user +++ b/.vs/msvc/bfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/btrfs.vcxproj b/.vs/msvc/btrfs.vcxproj index 006a883..5a42eab 100644 --- a/.vs/msvc/btrfs.vcxproj +++ b/.vs/msvc/btrfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {90A6AF01-88EF-4A77-956D-5391B6D097A3} btrfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,11 +167,9 @@ false CompileAsC Level3 - - ProgramDatabase - false Default + false MultiThreadedDebug @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,15 +190,13 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Btrfs";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="BFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase - false Default + false MultiThreadedDebug @@ -206,11 +222,36 @@ false CompileAsC Level3 - - ProgramDatabase + Default false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Btrfs";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase Default + false MultiThreadedDebug @@ -221,8 +262,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -232,12 +272,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Btrfs";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="BFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +288,7 @@ true - - - - + false true EFI Boot Service Driver @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Btrfs";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/btrfs.vcxproj.user b/.vs/msvc/btrfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/btrfs.vcxproj.user +++ b/.vs/msvc/btrfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/efifs.vcxproj b/.vs/msvc/efifs.vcxproj index e26593b..b8ef5ae 100644 --- a/.vs/msvc/efifs.vcxproj +++ b/.vs/msvc/efifs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -41,8 +49,12 @@ {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968} efifs + 10.0.15063.0 + + x64 + StaticLibrary true @@ -62,6 +74,13 @@ Unicode true + + StaticLibrary + true + v141 + Unicode + true + StaticLibrary false @@ -81,28 +100,14 @@ Unicode true + + StaticLibrary + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)x64\$(Configuration)\ $(OutDir)$(ProjectName)\ @@ -115,6 +120,10 @@ $(SolutionDir)arm\$(Configuration)\ $(OutDir)$(ProjectName)\ + + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ $(OutDir)$(ProjectName)\ @@ -127,6 +136,10 @@ $(SolutionDir)arm\$(Configuration)\ $(OutDir)$(ProjectName)\ + + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + Level3 @@ -138,6 +151,7 @@ ProgramDatabase false Default + /Oi- %(AdditionalOptions) true @@ -158,6 +172,7 @@ ProgramDatabase false Default + /Oi- %(AdditionalOptions) true @@ -178,6 +193,28 @@ ProgramDatabase false Default + /Oi- %(AdditionalOptions) + + + true + + + EFI Application + true + + + + + Level3 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir) + _UNICODE;UNICODE;GRUB_FILE=__FILE__;_MSC_EXTENSIONS;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreadedDebug + ProgramDatabase + false + Default + /Oi- %(AdditionalOptions) true @@ -196,6 +233,8 @@ CompileAsC MultiThreaded false + /Oi- %(AdditionalOptions) + MinSpace true @@ -217,6 +256,8 @@ CompileAsC MultiThreaded false + /Oi- %(AdditionalOptions) + MinSpace true @@ -238,6 +279,31 @@ CompileAsC MultiThreaded false + /Oi- %(AdditionalOptions) + MinSpace + + + true + true + true + + + EFI Application + true + false + + + + + Level3 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir) + _UNICODE;UNICODE;GRUB_FILE=__FILE__;_MSC_EXTENSIONS;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreaded + false + /Oi- %(AdditionalOptions) + MinSpace true diff --git a/.vs/msvc/exfat.vcxproj b/.vs/msvc/exfat.vcxproj index dc66ff2..bef169f 100644 --- a/.vs/msvc/exfat.vcxproj +++ b/.vs/msvc/exfat.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {25E5B551-F9DD-4D25-A7CD-A1090B558A49} exfat + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,24 +235,25 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) + - + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 ProgramDatabase + Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -247,10 +262,34 @@ true - - + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver @@ -263,13 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 - ProgramDatabase false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -278,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -294,13 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) false CompileAsC Level3 - ProgramDatabase false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -309,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ExFAT";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/exfat.vcxproj.user b/.vs/msvc/exfat.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/exfat.vcxproj.user +++ b/.vs/msvc/exfat.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/ext2.vcxproj b/.vs/msvc/ext2.vcxproj index 796a391..ecccd04 100644 --- a/.vs/msvc/ext2.vcxproj +++ b/.vs/msvc/ext2.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {78B6BD15-644D-496B-A5B0-1D964696D867} ext2 + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ext2/ext3/ext4";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/ext2.vcxproj.user b/.vs/msvc/ext2.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/ext2.vcxproj.user +++ b/.vs/msvc/ext2.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/f2fs.vcxproj b/.vs/msvc/f2fs.vcxproj index 8fb75fd..d5aa2fe 100644 --- a/.vs/msvc/f2fs.vcxproj +++ b/.vs/msvc/f2fs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {da9899dd-6878-41b5-a3a0-c77db31e1b1b} f2fs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,24 +235,25 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) + - + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 ProgramDatabase + Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -247,10 +262,34 @@ true - - + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver @@ -263,13 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 - ProgramDatabase false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -278,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -294,13 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) false CompileAsC Level3 - ProgramDatabase false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -309,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="F2FS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/f2fs.vcxproj.user b/.vs/msvc/f2fs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/f2fs.vcxproj.user +++ b/.vs/msvc/f2fs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/gnu-efi.vcxproj b/.vs/msvc/gnu-efi.vcxproj index 50cd855..6777d00 100644 --- a/.vs/msvc/gnu-efi.vcxproj +++ b/.vs/msvc/gnu-efi.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {3135D563-9596-4584-9ED6-616ADEC52974} gnuefi + 10.0.15063.0 + + x64 + StaticLibrary true @@ -50,46 +62,44 @@ Unicode true + + StaticLibrary + true + v141 + Unicode + true + StaticLibrary false v141 + true Unicode StaticLibrary false v141 + true Unicode StaticLibrary false v141 + true Unicode true + + StaticLibrary + false + v141 + true + Unicode + true + - - - - - - - - - - - - - - - - - - - - $(SolutionDir)x64\$(Configuration)\ $(OutDir)$(ProjectName)\ @@ -102,6 +112,10 @@ $(SolutionDir)arm\$(Configuration)\ $(OutDir)$(ProjectName)\ + + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ $(OutDir)$(ProjectName)\ @@ -114,19 +128,24 @@ $(SolutionDir)arm\$(Configuration)\ $(OutDir)$(ProjectName)\ + + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + Level3 Disabled $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreadedDebug 4312 ProgramDatabase - false Default + false + /Oi- true @@ -139,15 +158,17 @@ Level3 + Disabled $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreadedDebug ProgramDatabase 4312 - false Default + false + /Oi- true @@ -160,15 +181,40 @@ Level3 + Disabled $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreadedDebug ProgramDatabase 4312 + Default false + /Oi- + + + true + + + EFI Application + true + + + + + Level3 + Disabled + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;__SIZE_TYPE__=uint64_t;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreadedDebug + ProgramDatabase + 4312 Default + false + /Oi- true @@ -182,12 +228,15 @@ Level3 $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreaded 4312 false + false + /Oi- + MinSpace true @@ -197,19 +246,21 @@ EFI Application true - false Level3 $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreaded 4312 false + false + /Oi- + MinSpace true @@ -219,19 +270,45 @@ EFI Application true - false Level3 $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib - _UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) false CompileAsC MultiThreaded 4312 false + false + /Oi- + MinSpace + + + true + true + true + + + EFI Application + true + + + + + Level3 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\gnu-efi\inc\protocol;$(SolutionDir)\gnu-efi\lib + _UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;__SIZE_TYPE__=uint64_t;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreaded + 4312 + false + false + /Oi- + MinSpace true @@ -241,13 +318,34 @@ EFI Application true - false + + true + true + false + false + true + true + true + true + + + true + true + false + false + true + true + true + true + false false + true + true true true true @@ -256,6 +354,8 @@ false false + true + true true true true @@ -274,18 +374,22 @@ - false true - false + true true + true + false + false true true - false true - false + true true + true + false + false true true @@ -302,20 +406,24 @@ - false - false - true true - true + true true - - + true + true + true false false - true + + true - true + true true + true + true + true + false + false diff --git a/.vs/msvc/gnu-efi.vcxproj.filters b/.vs/msvc/gnu-efi.vcxproj.filters index 60e068c..865e8e2 100644 --- a/.vs/msvc/gnu-efi.vcxproj.filters +++ b/.vs/msvc/gnu-efi.vcxproj.filters @@ -9,14 +9,17 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd + + {20c8e9bd-0fa8-46d3-b825-e3eebd64ab3d} + - {70897b8f-ef20-415f-a6d1-5cbd549a305c} + {87122940-e80f-416d-a840-5e32f703f3ff} - {856e55b7-af6f-4af6-a0ef-e7aaefb04500} + {e6e3d25a-4fce-4036-bef9-3cfbafc4baaf} - - {c07e2cd0-6942-4e5f-a7c9-7b42b2203824} + + {cf7e7031-77e5-4827-9aa6-f996fc4b3d06} @@ -92,23 +95,29 @@ Source Files + + Source Files\arm + Source Files\x86_64 + + Source Files\ia32 + Source Files\x86_64 Source Files\ia32 - - Source Files\ia32 - Source Files\arm - - Source Files\arm + + Source Files\aarch64 + + + Source Files\aarch64 \ No newline at end of file diff --git a/.vs/msvc/grub.vcxproj b/.vs/msvc/grub.vcxproj index f54c4de..901ebc1 100644 --- a/.vs/msvc/grub.vcxproj +++ b/.vs/msvc/grub.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -38,35 +46,15 @@ - - - Document - true - true - true - true - false - false - - - Document - true - true - true - true - AMD64 - AMD64 - true - true - false - false - - {628E3F58-0AA9-40BB-8E49-D8CC513AAD63} grub + 10.0.15063.0 + + x64 + StaticLibrary true @@ -86,6 +74,13 @@ Unicode true + + StaticLibrary + true + v141 + Unicode + true + StaticLibrary false @@ -105,52 +100,48 @@ Unicode true + + StaticLibrary + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)x64\$(Configuration)\ + + $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + $(SolutionDir)aa64\$(Configuration)\ $(OutDir)$(ProjectName)\ $(SolutionDir)ia32\$(Configuration)\ $(OutDir)$(ProjectName)\ - + + $(SolutionDir)x64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + + $(SolutionDir)arm\$(Configuration)\ $(OutDir)$(ProjectName)\ - - $(SolutionDir)x64\$(Configuration)\ + + $(SolutionDir)aa64\$(Configuration)\ $(OutDir)$(ProjectName)\ $(SolutionDir)ia32\$(Configuration)\ $(OutDir)$(ProjectName)\ - - $(SolutionDir)arm\$(Configuration)\ + + $(SolutionDir)x64\$(Configuration)\ $(OutDir)$(ProjectName)\ @@ -164,6 +155,7 @@ ProgramDatabase Default false + /Oi- %(AdditionalOptions) true @@ -189,6 +181,7 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) ProgramDatabase Default false + /Oi- %(AdditionalOptions) true @@ -214,6 +207,33 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) ProgramDatabase Default false + /Oi- %(AdditionalOptions) + + + true + + + EFI Application + true + + + cd "$(SolutionDir)grub\include\grub\" +call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) + Set GRUB include\grub\cpu + + + + + Level3 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir) + LZO_CFG_FREESTANDING;_UNICODE;UNICODE;GRUB_FILE=__FILE__;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreadedDebug + ProgramDatabase + Default + false + /Oi- %(AdditionalOptions) true @@ -238,6 +258,8 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false + /Oi- %(AdditionalOptions) + MinSpace true @@ -265,6 +287,8 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false + /Oi- %(AdditionalOptions) + MinSpace true @@ -292,6 +316,37 @@ call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) MultiThreaded ProgramDatabase false + /Oi- %(AdditionalOptions) + MinSpace + + + true + true + true + + + EFI Application + true + false + + + cd "$(SolutionDir)grub\include\grub\" +call "$(SolutionDir)set_grub_cpu.cmd" $(Platform) + Set GRUB include\grub\cpu + + + + + Level3 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir) + LZO_CFG_FREESTANDING;_UNICODE;UNICODE;GRUB_FILE=__FILE__;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions) + false + CompileAsC + MultiThreaded + ProgramDatabase + false + /Oi- %(AdditionalOptions) + MinSpace true diff --git a/.vs/msvc/grub.vcxproj.filters b/.vs/msvc/grub.vcxproj.filters index 5deb263..4d8d3c9 100644 --- a/.vs/msvc/grub.vcxproj.filters +++ b/.vs/msvc/grub.vcxproj.filters @@ -9,9 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {8de95906-c39f-40d0-990c-dcb07d3d4a6d} - @@ -41,14 +38,4 @@ Header Files - - - Assembly Files - - - - - Assembly Files - - \ No newline at end of file diff --git a/.vs/msvc/hfs.vcxproj b/.vs/msvc/hfs.vcxproj index 298c770..6f190df 100644 --- a/.vs/msvc/hfs.vcxproj +++ b/.vs/msvc/hfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {3C59992B-38EA-43B4-B015-AC8CFA2E2494} hfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,23 +235,25 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) + - + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 + ProgramDatabase + Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -246,10 +262,34 @@ true - - + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver @@ -261,13 +301,15 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/hfs.vcxproj.user b/.vs/msvc/hfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/hfs.vcxproj.user +++ b/.vs/msvc/hfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/hfsplus.vcxproj b/.vs/msvc/hfsplus.vcxproj index 1c140a5..fae5c97 100644 --- a/.vs/msvc/hfsplus.vcxproj +++ b/.vs/msvc/hfsplus.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {1596254C-F747-4AEC-AFB7-0D06404A7A60} hfsplus + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ExFAT";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="HFS+";COMPRESSED_DRIVERNAME=$(ProjectName)comp;EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/hfsplus.vcxproj.user b/.vs/msvc/hfsplus.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/hfsplus.vcxproj.user +++ b/.vs/msvc/hfsplus.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/iso9660.vcxproj b/.vs/msvc/iso9660.vcxproj index 7e64921..ca479a2 100644 --- a/.vs/msvc/iso9660.vcxproj +++ b/.vs/msvc/iso9660.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {A6F3DBC3-01FE-4A63-B24D-927B0920D393} iso9660 + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ISO9660";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/iso9660.vcxproj.user b/.vs/msvc/iso9660.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/iso9660.vcxproj.user +++ b/.vs/msvc/iso9660.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/jfs.vcxproj b/.vs/msvc/jfs.vcxproj index bd58d75..efd6b70 100644 --- a/.vs/msvc/jfs.vcxproj +++ b/.vs/msvc/jfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {74F44DD7-6267-40AD-A5E8-931FFA363D2A} jfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="JFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/jfs.vcxproj.user b/.vs/msvc/jfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/jfs.vcxproj.user +++ b/.vs/msvc/jfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/nilfs2.vcxproj b/.vs/msvc/nilfs2.vcxproj index 7e69301..322703a 100644 --- a/.vs/msvc/nilfs2.vcxproj +++ b/.vs/msvc/nilfs2.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {D9277A92-969D-400C-AC7A-26BD17D8C54F} nilfs2 + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="NILFS2";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/nilfs2.vcxproj.user b/.vs/msvc/nilfs2.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/nilfs2.vcxproj.user +++ b/.vs/msvc/nilfs2.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/ntfs.vcxproj b/.vs/msvc/ntfs.vcxproj index 2b0528b..b0cdd74 100644 --- a/.vs/msvc/ntfs.vcxproj +++ b/.vs/msvc/ntfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE} ntfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,12 +167,11 @@ false CompileAsC Level3 - - ProgramDatabase Default false MultiThreadedDebug + /Oi- %(AdditionalOptions) EFI Application @@ -161,15 +181,12 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) true - - @@ -179,12 +196,11 @@ false CompileAsC Level3 - - ProgramDatabase Default false MultiThreadedDebug + /Oi- %(AdditionalOptions) EFI Application @@ -194,8 +210,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -209,12 +224,11 @@ false CompileAsC Level3 - - ProgramDatabase Default false MultiThreadedDebug + /Oi- %(AdditionalOptions) EFI Application @@ -230,8 +244,34 @@ true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) - - + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NTFS";COMPRESSED_DRIVERNAME=$(ProjectName)comp;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + /Oi- %(AdditionalOptions) + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) @@ -243,6 +283,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -251,10 +293,7 @@ true - - - - + false true EFI Boot Service Driver @@ -275,6 +314,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -283,10 +324,7 @@ true - - - - + false true EFI Boot Service Driver @@ -305,6 +343,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -313,10 +353,7 @@ true - - - - + false true EFI Boot Service Driver @@ -328,6 +365,35 @@ + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="NTFS";COMPRESSED_DRIVERNAME=$(ProjectName)comp;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + MinSpace + /Oi- %(AdditionalOptions) + + + EFI Application + + + true + + + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + diff --git a/.vs/msvc/ntfs.vcxproj.user b/.vs/msvc/ntfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/ntfs.vcxproj.user +++ b/.vs/msvc/ntfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/reiserfs.vcxproj b/.vs/msvc/reiserfs.vcxproj index c59c303..6031658 100644 --- a/.vs/msvc/reiserfs.vcxproj +++ b/.vs/msvc/reiserfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE} reiserfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="ReiserFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/reiserfs.vcxproj.user b/.vs/msvc/reiserfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/reiserfs.vcxproj.user +++ b/.vs/msvc/reiserfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/sfs.vcxproj b/.vs/msvc/sfs.vcxproj index 3433a96..2d18f06 100644 --- a/.vs/msvc/sfs.vcxproj +++ b/.vs/msvc/sfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {93BAE040-345F-43F9-BB5B-CD466793CFDF} sfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,8 +167,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -176,8 +194,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -206,8 +222,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,34 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Amiga SFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -238,6 +278,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +288,7 @@ true - - - - + false true EFI Boot Service Driver @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="Amiga SFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/sfs.vcxproj.user b/.vs/msvc/sfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/sfs.vcxproj.user +++ b/.vs/msvc/sfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/udf.vcxproj b/.vs/msvc/udf.vcxproj index 2c43360..df68140 100644 --- a/.vs/msvc/udf.vcxproj +++ b/.vs/msvc/udf.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {6738E0E8-B733-41DB-AECF-04FACEB2AC3C} udf + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -172,12 +190,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -202,12 +218,10 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,35 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -232,12 +273,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +289,7 @@ true - - - - + false true EFI Boot Service Driver @@ -262,12 +302,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +318,7 @@ true - - - - + false true EFI Boot Service Driver @@ -292,12 +331,14 @@ $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) - _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +347,37 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + DRIVERNAME=$(ProjectName);GRUB_FILE=__FILE__;_UNICODE;UNICODE;HAVE_USE_MS_ABI;__MAKEWITH_GNUEFI;GNU_EFI_USE_EXTERNAL_STDARG;DRIVERNAME_STR="UDF";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/udf.vcxproj.user b/.vs/msvc/udf.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/udf.vcxproj.user +++ b/.vs/msvc/udf.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/ufs.vcxproj b/.vs/msvc/ufs.vcxproj index 9a938f5..5f6f673 100644 --- a/.vs/msvc/ufs.vcxproj +++ b/.vs/msvc/ufs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {9CD88C50-8673-473B-879A-8B7FDCBCE5C9} ufs1 + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,8 +167,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -176,8 +194,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -206,8 +222,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,34 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -238,6 +278,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +288,7 @@ true - - - - + false true EFI Boot Service Driver @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/ufs.vcxproj.user b/.vs/msvc/ufs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/ufs.vcxproj.user +++ b/.vs/msvc/ufs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/ufs2.vcxproj b/.vs/msvc/ufs2.vcxproj index 0e4ee22..fe16c28 100644 --- a/.vs/msvc/ufs2.vcxproj +++ b/.vs/msvc/ufs2.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {330510F9-4AC9-4DB6-92EC-56C6A98CB393} ufs2 + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,12 +167,10 @@ false CompileAsC Level3 - - ProgramDatabase Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -176,12 +194,10 @@ false CompileAsC Level3 - - ProgramDatabase Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -206,12 +222,10 @@ false CompileAsC Level3 - - ProgramDatabase Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -221,21 +235,22 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) - + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UFS2";%(PreprocessorDefinitions) false CompileAsC Level3 + ProgramDatabase + Default false MultiThreadedDebug @@ -246,10 +261,34 @@ true - - + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UFS2";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver @@ -267,7 +306,9 @@ CompileAsC Level3 false - MultiThreadedDebug + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -297,7 +335,9 @@ CompileAsC Level3 false - MultiThreadedDebug + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="UFS2";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/ufs2.vcxproj.user b/.vs/msvc/ufs2.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/ufs2.vcxproj.user +++ b/.vs/msvc/ufs2.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/xfs.vcxproj b/.vs/msvc/xfs.vcxproj index 8639463..91f0e01 100644 --- a/.vs/msvc/xfs.vcxproj +++ b/.vs/msvc/xfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {5984B1BA-6999-402E-BB5E-F58C298270CB} xfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,10 +148,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) @@ -146,8 +167,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -176,8 +194,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -206,8 +222,6 @@ false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,8 +235,34 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="XFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + ProgramDatabase + Default + false + MultiThreadedDebug + + + EFI Application + + + true + + + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + false true EFI Boot Service Driver @@ -238,6 +278,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -246,10 +288,7 @@ true - - - - + false true EFI Boot Service Driver @@ -268,6 +307,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -298,6 +336,8 @@ Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="XFS";%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/xfs.vcxproj.user b/.vs/msvc/xfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/xfs.vcxproj.user +++ b/.vs/msvc/xfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/.vs/msvc/zfs.vcxproj b/.vs/msvc/zfs.vcxproj index a85d732..b573073 100644 --- a/.vs/msvc/zfs.vcxproj +++ b/.vs/msvc/zfs.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,8 +37,12 @@ {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51} zfs + 10.0.15063.0 + + x64 + Application true @@ -50,6 +62,13 @@ Unicode true + + Application + true + v141 + Unicode + true + Application false @@ -69,28 +88,14 @@ Unicode true + + Application + false + v141 + Unicode + true + - - - - - - - - - - - - - - - - - - - - - .efi false @@ -111,10 +116,18 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + .efi false @@ -135,19 +148,25 @@ .efi false false - $(OutDir)$(ProjectName)\ $(SolutionDir)arm\$(Configuration)\ + $(OutDir)$(ProjectName)\ $(ProjectName)_arm + + .efi + false + false + $(SolutionDir)aa64\$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(ProjectName)_aa64 + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -161,8 +180,7 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver @@ -171,13 +189,11 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -201,13 +217,11 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 - - ProgramDatabase Default false @@ -221,23 +235,24 @@ gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) - - + false true EFI Boot Service Driver $(OutDir);%(AdditionalLibraryDirectories) - + - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 + ProgramDatabase + Default false - MultiThreaded + MultiThreadedDebug EFI Application @@ -246,10 +261,34 @@ true - - + gnu-efi.lib;grub.lib;efifs.lib;libcmtd.lib;%(AdditionalDependencies) + + false + true + EFI Boot Service Driver + $(OutDir);%(AdditionalLibraryDirectories) + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver @@ -261,13 +300,15 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -276,10 +317,7 @@ true - - - - + false true EFI Boot Service Driver @@ -291,13 +329,15 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC Level3 false MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace EFI Application @@ -306,10 +346,36 @@ true - - + + false + true + EFI Boot Service Driver + gnu-efi.lib;grub.lib;efifs.lib;libcmt.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + /IGNORE:4210 %(AdditionalOptions) + true + + + + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) + false + CompileAsC + Level3 + false + MultiThreaded + /Oi- %(AdditionalOptions) + MinSpace + + + EFI Application + + + true + + false true EFI Boot Service Driver diff --git a/.vs/msvc/zfs.vcxproj.user b/.vs/msvc/zfs.vcxproj.user index ae8e450..f3e2ca0 100644 --- a/.vs/msvc/zfs.vcxproj.user +++ b/.vs/msvc/zfs.vcxproj.user @@ -18,6 +18,12 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + $(SystemRoot)\System32\wscript //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" @@ -36,4 +42,10 @@ WindowsLocalDebugger $(SolutionDir) + + $(SystemRoot)\System32\wscript + //d debug.vbs "$(Configuration)" "$(ProjectName)" "$(TargetPath)" "$(PlatformShortName)" + WindowsLocalDebugger + $(SolutionDir) + \ No newline at end of file diff --git a/0002-GRUB-fixes-for-VS-MSVC.patch b/0002-GRUB-fixes-for-VS-MSVC.patch index eccbb2e..e1bd0d1 100644 --- a/0002-GRUB-fixes-for-VS-MSVC.patch +++ b/0002-GRUB-fixes-for-VS-MSVC.patch @@ -1,38 +1,40 @@ -From da61392469c17c75021380581cf84db47e18c584 Mon Sep 17 00:00:00 2001 +From 4de8e63b5cf25cc83a53e76254f15745d474541b Mon Sep 17 00:00:00 2001 From: Pete Batard -Date: Fri, 28 Jul 2017 12:54:37 +0100 -Subject: [PATCH 3/4] MSVC compatibility fixes, for packed structs, - initialization, etc +Date: Sat, 4 Nov 2017 22:36:40 +0000 +Subject: [PATCH] MSVC compatibility fixes, for packed structs, initialization, + etc --- - grub-core/fs/affs.c | 2 ++ - grub-core/fs/bfs.c | 2 ++ - grub-core/fs/btrfs.c | 14 ++++++++++---- - grub-core/fs/fat.c | 8 ++++++-- - grub-core/fs/hfs.c | 6 ++++++ - grub-core/fs/hfsplus.c | 2 ++ - grub-core/fs/hfspluscomp.c | 5 +++++ - grub-core/fs/iso9660.c | 36 ++++++++++++++++++++++++------------ - grub-core/fs/jfs.c | 2 ++ - grub-core/fs/nilfs2.c | 2 ++ - grub-core/fs/ntfs.c | 2 ++ - grub-core/fs/reiserfs.c | 16 +++++++++++++++- - grub-core/fs/sfs.c | 4 +++- - grub-core/fs/udf.c | 2 ++ - grub-core/fs/ufs.c | 2 ++ - grub-core/fs/xfs.c | 3 +++ - grub-core/fs/zfs/zfs.c | 4 ++-- - grub-core/kern/misc.c | 2 +- - include/grub/btrfs.h | 3 +++ - include/grub/hfs.h | 2 ++ - include/grub/hfsplus.h | 6 ++++++ - include/grub/misc.h | 10 ++++++++++ - include/grub/ntfs.h | 2 ++ - include/grub/term.h | 4 ++-- - include/grub/types.h | 36 +++++++++++++++++++++++++----------- - include/grub/zfs/zap_leaf.h | 17 ++++++++++++++--- - include/grub/zfs/zio.h | 2 ++ - 27 files changed, 157 insertions(+), 39 deletions(-) + grub-core/fs/affs.c | 2 ++ + grub-core/fs/bfs.c | 2 ++ + grub-core/fs/btrfs.c | 16 +++++++++++----- + grub-core/fs/fat.c | 8 ++++++-- + grub-core/fs/hfs.c | 6 ++++++ + grub-core/fs/hfsplus.c | 2 ++ + grub-core/fs/hfspluscomp.c | 5 +++++ + grub-core/fs/iso9660.c | 36 ++++++++++++++++++++++++------------ + grub-core/fs/jfs.c | 2 ++ + grub-core/fs/nilfs2.c | 4 +++- + grub-core/fs/ntfs.c | 2 ++ + grub-core/fs/reiserfs.c | 16 +++++++++++++++- + grub-core/fs/sfs.c | 4 +++- + grub-core/fs/udf.c | 2 ++ + grub-core/fs/ufs.c | 2 ++ + grub-core/fs/xfs.c | 3 +++ + grub-core/fs/zfs/zfs.c | 4 ++-- + grub-core/kern/misc.c | 2 +- + grub-core/lib/minilzo/lzodefs.h | 3 +++ + include/grub/arm64/types.h | 4 ++++ + include/grub/btrfs.h | 3 +++ + include/grub/hfs.h | 2 ++ + include/grub/hfsplus.h | 6 ++++++ + include/grub/misc.h | 10 ++++++++++ + include/grub/ntfs.h | 2 ++ + include/grub/term.h | 4 ++-- + include/grub/types.h | 36 +++++++++++++++++++++++++----------- + include/grub/zfs/zap_leaf.h | 17 ++++++++++++++--- + include/grub/zfs/zio.h | 2 ++ + 29 files changed, 166 insertions(+), 41 deletions(-) diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c index 8580d81..26e4a33 100644 @@ -75,7 +77,7 @@ index d2b490b..8d78fd6 100644 struct grub_bfs_data { diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 4849c1c..de1f023 100644 +index 4849c1c..51dc891 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -48,6 +48,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -126,6 +128,15 @@ index 4849c1c..de1f023 100644 #define GRUB_BTRFS_EXTENT_INLINE 0 #define GRUB_BTRFS_EXTENT_REGULAR 1 +@@ -227,7 +233,7 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, + static grub_err_t + read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb) + { +- struct grub_btrfs_superblock sblock; ++ struct grub_btrfs_superblock sblock = { 0 }; + unsigned i; + grub_err_t err = GRUB_ERR_NONE; + for (i = 0; i < ARRAY_SIZE (superblock_sectors); i++) @@ -692,8 +698,8 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, "couldn't find the chunk descriptor"); } @@ -450,7 +461,7 @@ index aab3e8c..4ec849a 100644 static grub_dl_t my_mod; diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index 598a2a5..137a555 100644 +index 598a2a5..a566361 100644 --- a/grub-core/fs/nilfs2.c +++ b/grub-core/fs/nilfs2.c @@ -132,6 +132,7 @@ struct grub_nilfs2_super_block @@ -469,6 +480,15 @@ index 598a2a5..137a555 100644 enum { +@@ -735,7 +737,7 @@ static grub_err_t + grub_nilfs2_load_sb (struct grub_nilfs2_data *data) + { + grub_disk_t disk = data->disk; +- struct grub_nilfs2_super_block sb2; ++ struct grub_nilfs2_super_block sb2 = { 0 }; + grub_uint64_t partition_size; + int valid[2]; + int swp = 0; diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c index 6f84688..4fa140e 100644 --- a/grub-core/fs/ntfs.c @@ -563,7 +583,7 @@ index 57b8d8d..a69eae6 100644 { grub_uint32_t off; diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index 839bff8..ab3d0d5 100644 +index 00a1609..e918267 100644 --- a/grub-core/fs/udf.c +++ b/grub-core/fs/udf.c @@ -113,6 +113,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -574,7 +594,7 @@ index 839bff8..ab3d0d5 100644 struct grub_udf_lb_addr { grub_uint32_t block_num; -@@ -344,6 +345,7 @@ struct grub_udf_aed +@@ -370,6 +371,7 @@ struct grub_udf_aed grub_uint32_t prev_ae; grub_uint32_t ae_len; } GRUB_PACKED; @@ -665,6 +685,36 @@ index 9024c10..498ec83 100644 grub_size_t i; while (len < format2 && p[len]) +diff --git a/grub-core/lib/minilzo/lzodefs.h b/grub-core/lib/minilzo/lzodefs.h +index 0e40e33..eea56b1 100644 +--- a/grub-core/lib/minilzo/lzodefs.h ++++ b/grub-core/lib/minilzo/lzodefs.h +@@ -670,6 +670,9 @@ + # define LZO_ARCH_I086 1 + # define LZO_ARCH_IA16 1 + # define LZO_INFO_ARCH "i086" ++#elif defined(__aarch64__) || defined(_M_ARM64) ++# define LZO_ARCH_ARM64 1 ++# define LZO_INFO_ARCH "arm64" + #elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) + # define LZO_ARCH_ALPHA 1 + # define LZO_INFO_ARCH "alpha" +diff --git a/include/grub/arm64/types.h b/include/grub/arm64/types.h +index d132c5e..54b5e63 100644 +--- a/include/grub/arm64/types.h ++++ b/include/grub/arm64/types.h +@@ -23,7 +23,11 @@ + #define GRUB_TARGET_SIZEOF_VOID_P 8 + + /* The size of long. */ ++#if defined(_MSC_VER) ++#define GRUB_TARGET_SIZEOF_LONG 4 ++#else + #define GRUB_TARGET_SIZEOF_LONG 8 ++#endif + + /* currently only support little-endian. */ + #undef GRUB_TARGET_WORDS_BIGENDIAN diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h index 9d93fb6..f62312c 100644 --- a/include/grub/btrfs.h @@ -811,10 +861,10 @@ index d1a6af6..203e014 100644 struct grub_ntfs_attr { diff --git a/include/grub/term.h b/include/grub/term.h -index 5ffb38f..cc6d92a 100644 +index 8117e2a..f87c0d0 100644 --- a/include/grub/term.h +++ b/include/grub/term.h -@@ -334,12 +334,12 @@ void grub_term_restore_pos (struct grub_term_coordinate *pos); +@@ -335,12 +335,12 @@ void grub_term_restore_pos (struct grub_term_coordinate *pos); static inline unsigned grub_term_width (struct grub_term_output *term) { diff --git a/Make.common b/Make.common index 1e2916b..df59821 100644 --- a/Make.common +++ b/Make.common @@ -1,5 +1,9 @@ ARCH = x64 -SUBSYSTEM = 12 # 12 = EFI runtime driver +# You can alter the subsystem according to your EFI binary target: +# 10 = EFI application +# 11 = EFI boot service driver +# 12 = EFI runtime driver +SUBSYSTEM = 11 # Try to auto-detect the target ARCH ifeq ($(shell uname -o),Msys) diff --git a/debug.vbs b/debug.vbs index f50f956..a91ba77 100644 --- a/debug.vbs +++ b/debug.vbs @@ -37,6 +37,12 @@ ElseIf (TARGET = "ARM") Then QEMU_OPTS = "-M virt -cpu cortex-a15 " & QEMU_OPTS PRE_CMD = "dir " FW_BASE = "QEMU_EFI" +ElseIf (TARGET = "ARM64") Then + UEFI_EXT = "aa64" + QEMU_ARCH = "aarch64" + QEMU_OPTS = "-M virt -cpu cortex-a57 " & QEMU_OPTS + PRE_CMD = "dir " + FW_BASE = "QEMU_EFI" Else MsgBox("Unsupported debug target: " & TARGET) Call WScript.Quit(1) diff --git a/efifs.sln b/efifs.sln index 72e7428..1dcca5f 100644 --- a/efifs.sln +++ b/efifs.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +VisualStudioVersion = 15.0.27004.2006 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntfs", ".vs\msvc\ntfs.vcxproj", "{DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}" ProjectSection(ProjectDependencies) = postProject @@ -156,273 +156,363 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm = Debug|arm + Debug|aa64 = Debug|aa64 Debug|ia32 = Debug|ia32 Debug|x64 = Debug|x64 Release|arm = Release|arm + Release|aa64 = Release|aa64 Release|ia32 = Release|ia32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|arm.ActiveCfg = Debug|ARM {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|arm.Build.0 = Debug|ARM + {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|aa64.ActiveCfg = Debug|ARM64 + {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|aa64.Build.0 = Debug|ARM64 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|ia32.ActiveCfg = Debug|Win32 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|ia32.Build.0 = Debug|Win32 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|x64.ActiveCfg = Debug|x64 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Debug|x64.Build.0 = Debug|x64 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|arm.ActiveCfg = Release|ARM {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|arm.Build.0 = Release|ARM + {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|aa64.ActiveCfg = Release|ARM64 + {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|aa64.Build.0 = Release|ARM64 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|ia32.ActiveCfg = Release|Win32 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|ia32.Build.0 = Release|Win32 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|x64.ActiveCfg = Release|x64 {DFA0BA98-D0BA-4176-9A34-B5BA6355B1DE}.Release|x64.Build.0 = Release|x64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|arm.ActiveCfg = Debug|ARM {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|arm.Build.0 = Debug|ARM + {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|aa64.ActiveCfg = Debug|ARM64 + {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|aa64.Build.0 = Debug|ARM64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|ia32.ActiveCfg = Debug|Win32 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|ia32.Build.0 = Debug|Win32 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|x64.ActiveCfg = Debug|x64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Debug|x64.Build.0 = Debug|x64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|arm.ActiveCfg = Release|ARM {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|arm.Build.0 = Release|ARM + {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|aa64.ActiveCfg = Release|ARM64 + {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|aa64.Build.0 = Release|ARM64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|ia32.ActiveCfg = Release|Win32 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|ia32.Build.0 = Release|Win32 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|x64.ActiveCfg = Release|x64 {25E5B551-F9DD-4D25-A7CD-A1090B558A49}.Release|x64.Build.0 = Release|x64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|arm.ActiveCfg = Debug|ARM {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|arm.Build.0 = Debug|ARM + {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|aa64.ActiveCfg = Debug|ARM64 + {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|aa64.Build.0 = Debug|ARM64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|ia32.ActiveCfg = Debug|Win32 {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|ia32.Build.0 = Debug|Win32 {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|x64.ActiveCfg = Debug|x64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Debug|x64.Build.0 = Debug|x64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|arm.ActiveCfg = Release|ARM {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|arm.Build.0 = Release|ARM + {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|aa64.ActiveCfg = Release|ARM64 + {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|aa64.Build.0 = Release|ARM64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|ia32.ActiveCfg = Release|Win32 {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|ia32.Build.0 = Release|Win32 {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|x64.ActiveCfg = Release|x64 {78B6BD15-644D-496B-A5B0-1D964696D867}.Release|x64.Build.0 = Release|x64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|arm.ActiveCfg = Debug|ARM {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|arm.Build.0 = Debug|ARM + {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|aa64.ActiveCfg = Debug|ARM64 + {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|aa64.Build.0 = Debug|ARM64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|ia32.ActiveCfg = Debug|Win32 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|ia32.Build.0 = Debug|Win32 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|x64.ActiveCfg = Debug|x64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Debug|x64.Build.0 = Debug|x64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|arm.ActiveCfg = Release|ARM {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|arm.Build.0 = Release|ARM + {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|aa64.ActiveCfg = Release|ARM64 + {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|aa64.Build.0 = Release|ARM64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|ia32.ActiveCfg = Release|Win32 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|ia32.Build.0 = Release|Win32 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|x64.ActiveCfg = Release|x64 {A6F3DBC3-01FE-4A63-B24D-927B0920D393}.Release|x64.Build.0 = Release|x64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|arm.ActiveCfg = Debug|ARM {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|arm.Build.0 = Debug|ARM + {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|aa64.ActiveCfg = Debug|ARM64 + {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|aa64.Build.0 = Debug|ARM64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|ia32.ActiveCfg = Debug|Win32 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|ia32.Build.0 = Debug|Win32 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|x64.ActiveCfg = Debug|x64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Debug|x64.Build.0 = Debug|x64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|arm.ActiveCfg = Release|ARM {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|arm.Build.0 = Release|ARM + {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|aa64.ActiveCfg = Release|ARM64 + {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|aa64.Build.0 = Release|ARM64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|ia32.ActiveCfg = Release|Win32 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|ia32.Build.0 = Release|Win32 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|x64.ActiveCfg = Release|x64 {E65DAD8F-B2D7-4CF7-9151-FBFCEF766968}.Release|x64.Build.0 = Release|x64 {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|arm.ActiveCfg = Debug|ARM {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|arm.Build.0 = Debug|ARM + {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|aa64.ActiveCfg = Debug|ARM64 + {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|aa64.Build.0 = Debug|ARM64 {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|ia32.ActiveCfg = Debug|Win32 {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|ia32.Build.0 = Debug|Win32 {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|x64.ActiveCfg = Debug|x64 {3135D563-9596-4584-9ED6-616ADEC52974}.Debug|x64.Build.0 = Debug|x64 {3135D563-9596-4584-9ED6-616ADEC52974}.Release|arm.ActiveCfg = Release|ARM {3135D563-9596-4584-9ED6-616ADEC52974}.Release|arm.Build.0 = Release|ARM + {3135D563-9596-4584-9ED6-616ADEC52974}.Release|aa64.ActiveCfg = Release|ARM64 + {3135D563-9596-4584-9ED6-616ADEC52974}.Release|aa64.Build.0 = Release|ARM64 {3135D563-9596-4584-9ED6-616ADEC52974}.Release|ia32.ActiveCfg = Release|Win32 {3135D563-9596-4584-9ED6-616ADEC52974}.Release|ia32.Build.0 = Release|Win32 {3135D563-9596-4584-9ED6-616ADEC52974}.Release|x64.ActiveCfg = Release|x64 {3135D563-9596-4584-9ED6-616ADEC52974}.Release|x64.Build.0 = Release|x64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|arm.ActiveCfg = Debug|ARM {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|arm.Build.0 = Debug|ARM + {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|aa64.ActiveCfg = Debug|ARM64 + {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|aa64.Build.0 = Debug|ARM64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|ia32.ActiveCfg = Debug|Win32 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|ia32.Build.0 = Debug|Win32 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|x64.ActiveCfg = Debug|x64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Debug|x64.Build.0 = Debug|x64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|arm.ActiveCfg = Release|ARM {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|arm.Build.0 = Release|ARM + {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|aa64.ActiveCfg = Release|ARM64 + {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|aa64.Build.0 = Release|ARM64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|ia32.ActiveCfg = Release|Win32 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|ia32.Build.0 = Release|Win32 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|x64.ActiveCfg = Release|x64 {628E3F58-0AA9-40BB-8E49-D8CC513AAD63}.Release|x64.Build.0 = Release|x64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|arm.ActiveCfg = Debug|ARM {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|arm.Build.0 = Debug|ARM + {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|aa64.ActiveCfg = Debug|ARM64 + {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|aa64.Build.0 = Debug|ARM64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|ia32.ActiveCfg = Debug|Win32 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|ia32.Build.0 = Debug|Win32 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|x64.ActiveCfg = Debug|x64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Debug|x64.Build.0 = Debug|x64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|arm.ActiveCfg = Release|ARM {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|arm.Build.0 = Release|ARM + {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|aa64.ActiveCfg = Release|ARM64 + {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|aa64.Build.0 = Release|ARM64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|ia32.ActiveCfg = Release|Win32 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|ia32.Build.0 = Release|Win32 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|x64.ActiveCfg = Release|x64 {984927FE-DDE3-4BD6-B289-F8E49A1204B8}.Release|x64.Build.0 = Release|x64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|arm.ActiveCfg = Debug|ARM {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|arm.Build.0 = Debug|ARM + {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|aa64.ActiveCfg = Debug|ARM64 + {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|aa64.Build.0 = Debug|ARM64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|ia32.ActiveCfg = Debug|Win32 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|ia32.Build.0 = Debug|Win32 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|x64.ActiveCfg = Debug|x64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Debug|x64.Build.0 = Debug|x64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|arm.ActiveCfg = Release|ARM {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|arm.Build.0 = Release|ARM + {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|aa64.ActiveCfg = Release|ARM64 + {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|aa64.Build.0 = Release|ARM64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|ia32.ActiveCfg = Release|Win32 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|ia32.Build.0 = Release|Win32 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|x64.ActiveCfg = Release|x64 {D085632B-FEE9-4126-A6ED-030E88F4B8A3}.Release|x64.Build.0 = Release|x64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|arm.ActiveCfg = Debug|ARM {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|arm.Build.0 = Debug|ARM + {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|aa64.ActiveCfg = Debug|ARM64 + {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|aa64.Build.0 = Debug|ARM64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|ia32.ActiveCfg = Debug|Win32 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|ia32.Build.0 = Debug|Win32 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|x64.ActiveCfg = Debug|x64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Debug|x64.Build.0 = Debug|x64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|arm.ActiveCfg = Release|ARM {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|arm.Build.0 = Release|ARM + {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|aa64.ActiveCfg = Release|ARM64 + {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|aa64.Build.0 = Release|ARM64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|ia32.ActiveCfg = Release|Win32 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|ia32.Build.0 = Release|Win32 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|x64.ActiveCfg = Release|x64 {90A6AF01-88EF-4A77-956D-5391B6D097A3}.Release|x64.Build.0 = Release|x64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|arm.ActiveCfg = Debug|ARM {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|arm.Build.0 = Debug|ARM + {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|aa64.ActiveCfg = Debug|ARM64 + {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|aa64.Build.0 = Debug|ARM64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|ia32.ActiveCfg = Debug|Win32 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|ia32.Build.0 = Debug|Win32 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|x64.ActiveCfg = Debug|x64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Debug|x64.Build.0 = Debug|x64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|arm.ActiveCfg = Release|ARM {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|arm.Build.0 = Release|ARM + {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|aa64.ActiveCfg = Release|ARM64 + {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|aa64.Build.0 = Release|ARM64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|ia32.ActiveCfg = Release|Win32 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|ia32.Build.0 = Release|Win32 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|x64.ActiveCfg = Release|x64 {3C59992B-38EA-43B4-B015-AC8CFA2E2494}.Release|x64.Build.0 = Release|x64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|arm.ActiveCfg = Debug|ARM {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|arm.Build.0 = Debug|ARM + {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|aa64.ActiveCfg = Debug|ARM64 + {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|aa64.Build.0 = Debug|ARM64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|ia32.ActiveCfg = Debug|Win32 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|ia32.Build.0 = Debug|Win32 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|x64.ActiveCfg = Debug|x64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Debug|x64.Build.0 = Debug|x64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|arm.ActiveCfg = Release|ARM {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|arm.Build.0 = Release|ARM + {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|aa64.ActiveCfg = Release|ARM64 + {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|aa64.Build.0 = Release|ARM64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|ia32.ActiveCfg = Release|Win32 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|ia32.Build.0 = Release|Win32 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|x64.ActiveCfg = Release|x64 {1596254C-F747-4AEC-AFB7-0D06404A7A60}.Release|x64.Build.0 = Release|x64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|arm.ActiveCfg = Debug|ARM {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|arm.Build.0 = Debug|ARM + {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|aa64.ActiveCfg = Debug|ARM64 + {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|aa64.Build.0 = Debug|ARM64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|ia32.ActiveCfg = Debug|Win32 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|ia32.Build.0 = Debug|Win32 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|x64.ActiveCfg = Debug|x64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Debug|x64.Build.0 = Debug|x64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|arm.ActiveCfg = Release|ARM {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|arm.Build.0 = Release|ARM + {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|aa64.ActiveCfg = Release|ARM64 + {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|aa64.Build.0 = Release|ARM64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|ia32.ActiveCfg = Release|Win32 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|ia32.Build.0 = Release|Win32 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|x64.ActiveCfg = Release|x64 {74F44DD7-6267-40AD-A5E8-931FFA363D2A}.Release|x64.Build.0 = Release|x64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|arm.ActiveCfg = Debug|ARM {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|arm.Build.0 = Debug|ARM + {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|aa64.ActiveCfg = Debug|ARM64 + {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|aa64.Build.0 = Debug|ARM64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|ia32.ActiveCfg = Debug|Win32 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|ia32.Build.0 = Debug|Win32 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|x64.ActiveCfg = Debug|x64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Debug|x64.Build.0 = Debug|x64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|arm.ActiveCfg = Release|ARM {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|arm.Build.0 = Release|ARM + {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|aa64.ActiveCfg = Release|ARM64 + {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|aa64.Build.0 = Release|ARM64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|ia32.ActiveCfg = Release|Win32 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|ia32.Build.0 = Release|Win32 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|x64.ActiveCfg = Release|x64 {D9277A92-969D-400C-AC7A-26BD17D8C54F}.Release|x64.Build.0 = Release|x64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|arm.ActiveCfg = Debug|ARM {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|arm.Build.0 = Debug|ARM + {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|aa64.ActiveCfg = Debug|ARM64 + {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|aa64.Build.0 = Debug|ARM64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|ia32.ActiveCfg = Debug|Win32 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|ia32.Build.0 = Debug|Win32 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|x64.ActiveCfg = Debug|x64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Debug|x64.Build.0 = Debug|x64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|arm.ActiveCfg = Release|ARM {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|arm.Build.0 = Release|ARM + {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|aa64.ActiveCfg = Release|ARM64 + {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|aa64.Build.0 = Release|ARM64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|ia32.ActiveCfg = Release|Win32 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|ia32.Build.0 = Release|Win32 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|x64.ActiveCfg = Release|x64 {BE4C8D10-A2B6-4442-92F3-B3589EF35AEE}.Release|x64.Build.0 = Release|x64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|arm.ActiveCfg = Debug|ARM {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|arm.Build.0 = Debug|ARM + {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|aa64.ActiveCfg = Debug|ARM64 + {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|aa64.Build.0 = Debug|ARM64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|ia32.ActiveCfg = Debug|Win32 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|ia32.Build.0 = Debug|Win32 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|x64.ActiveCfg = Debug|x64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Debug|x64.Build.0 = Debug|x64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|arm.ActiveCfg = Release|ARM {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|arm.Build.0 = Release|ARM + {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|aa64.ActiveCfg = Release|ARM64 + {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|aa64.Build.0 = Release|ARM64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|ia32.ActiveCfg = Release|Win32 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|ia32.Build.0 = Release|Win32 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|x64.ActiveCfg = Release|x64 {93BAE040-345F-43F9-BB5B-CD466793CFDF}.Release|x64.Build.0 = Release|x64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|arm.ActiveCfg = Debug|ARM {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|arm.Build.0 = Debug|ARM + {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|aa64.ActiveCfg = Debug|ARM64 + {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|aa64.Build.0 = Debug|ARM64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|ia32.ActiveCfg = Debug|Win32 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|ia32.Build.0 = Debug|Win32 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|x64.ActiveCfg = Debug|x64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Debug|x64.Build.0 = Debug|x64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|arm.ActiveCfg = Release|ARM {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|arm.Build.0 = Release|ARM + {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|aa64.ActiveCfg = Release|ARM64 + {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|aa64.Build.0 = Release|ARM64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|ia32.ActiveCfg = Release|Win32 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|ia32.Build.0 = Release|Win32 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|x64.ActiveCfg = Release|x64 {6738E0E8-B733-41DB-AECF-04FACEB2AC3C}.Release|x64.Build.0 = Release|x64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|arm.ActiveCfg = Debug|ARM {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|arm.Build.0 = Debug|ARM + {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|aa64.ActiveCfg = Debug|ARM64 + {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|aa64.Build.0 = Debug|ARM64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|ia32.ActiveCfg = Debug|Win32 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|ia32.Build.0 = Debug|Win32 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|x64.ActiveCfg = Debug|x64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Debug|x64.Build.0 = Debug|x64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|arm.ActiveCfg = Release|ARM {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|arm.Build.0 = Release|ARM + {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|aa64.ActiveCfg = Release|ARM64 + {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|aa64.Build.0 = Release|ARM64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|ia32.ActiveCfg = Release|Win32 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|ia32.Build.0 = Release|Win32 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|x64.ActiveCfg = Release|x64 {330510F9-4AC9-4DB6-92EC-56C6A98CB393}.Release|x64.Build.0 = Release|x64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|arm.ActiveCfg = Debug|ARM {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|arm.Build.0 = Debug|ARM + {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|aa64.ActiveCfg = Debug|ARM64 + {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|aa64.Build.0 = Debug|ARM64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|ia32.ActiveCfg = Debug|Win32 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|ia32.Build.0 = Debug|Win32 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|x64.ActiveCfg = Debug|x64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Debug|x64.Build.0 = Debug|x64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|arm.ActiveCfg = Release|ARM {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|arm.Build.0 = Release|ARM + {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|aa64.ActiveCfg = Release|ARM64 + {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|aa64.Build.0 = Release|ARM64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|ia32.ActiveCfg = Release|Win32 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|ia32.Build.0 = Release|Win32 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|x64.ActiveCfg = Release|x64 {5984B1BA-6999-402E-BB5E-F58C298270CB}.Release|x64.Build.0 = Release|x64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|arm.ActiveCfg = Debug|ARM {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|arm.Build.0 = Debug|ARM + {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|aa64.ActiveCfg = Debug|ARM64 + {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|aa64.Build.0 = Debug|ARM64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|ia32.ActiveCfg = Debug|Win32 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|ia32.Build.0 = Debug|Win32 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|x64.ActiveCfg = Debug|x64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Debug|x64.Build.0 = Debug|x64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|arm.ActiveCfg = Release|ARM {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|arm.Build.0 = Release|ARM + {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|aa64.ActiveCfg = Release|ARM64 + {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|aa64.Build.0 = Release|ARM64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|ia32.ActiveCfg = Release|Win32 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|ia32.Build.0 = Release|Win32 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|x64.ActiveCfg = Release|x64 {5ADAB8AE-54B6-4EF5-8FF8-884FE430BE51}.Release|x64.Build.0 = Release|x64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|arm.ActiveCfg = Debug|ARM {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|arm.Build.0 = Debug|ARM + {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|aa64.ActiveCfg = Debug|ARM64 + {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|aa64.Build.0 = Debug|ARM64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|ia32.ActiveCfg = Debug|Win32 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|ia32.Build.0 = Debug|Win32 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|x64.ActiveCfg = Debug|x64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Debug|x64.Build.0 = Debug|x64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|arm.ActiveCfg = Release|ARM {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|arm.Build.0 = Release|ARM + {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|aa64.ActiveCfg = Release|ARM64 + {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|aa64.Build.0 = Release|ARM64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|ia32.ActiveCfg = Release|Win32 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|ia32.Build.0 = Release|Win32 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|x64.ActiveCfg = Release|x64 {9CD88C50-8673-473B-879A-8B7FDCBCE5C9}.Release|x64.Build.0 = Release|x64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|arm.ActiveCfg = Debug|ARM {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|arm.Build.0 = Debug|ARM + {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|aa64.ActiveCfg = Debug|ARM64 + {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|aa64.Build.0 = Debug|ARM64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|ia32.ActiveCfg = Debug|Win32 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|ia32.Build.0 = Debug|Win32 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|x64.ActiveCfg = Debug|x64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Debug|x64.Build.0 = Debug|x64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|arm.ActiveCfg = Release|ARM {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|arm.Build.0 = Release|ARM + {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|aa64.ActiveCfg = Release|ARM64 + {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|aa64.Build.0 = Release|ARM64 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|ia32.ActiveCfg = Release|Win32 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|ia32.Build.0 = Release|Win32 {DA9899DD-6878-41B5-A3A0-C77DB31E1B1B}.Release|x64.ActiveCfg = Release|x64 diff --git a/gnu-efi b/gnu-efi index 08a4661..f99001c 160000 --- a/gnu-efi +++ b/gnu-efi @@ -1 +1 @@ -Subproject commit 08a46615c70f5af195443fcf5d0fd425fa329096 +Subproject commit f99001cd7d4c27d1b365b70ac45b14f84ee46237 diff --git a/src/missing.c b/src/missing.c index 6030c8b..6b41691 100644 --- a/src/missing.c +++ b/src/missing.c @@ -22,8 +22,7 @@ // Microsoft's intrinsics are a major pain in the ass // https://stackoverflow.com/a/2945619/1069307 -#if defined(_MSC_VER) || defined(__c2__) -#if !defined(__MAKEWITH_GNUEFI) || defined(_M_X64) +#if defined(_MSC_VER) && !defined(__MAKEWITH_GNUEFI) #include // For size_t void* memset(void *, int, size_t); @@ -84,7 +83,6 @@ UINT64 _aullshr(UINT64 a, INTN b) LShiftU64(a, (UINTN)-b); } #endif -#endif VOID strcpya(CHAR8 *dst, CONST CHAR8 *src)