diff --git a/.gitignore b/.gitignore index 3b26472e..6ac9a73e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ .libs Makefile arm +arm64 x86_32 x86_64 autom4te.cache diff --git a/rufus.sln b/rufus.sln index 30c8f379..f0a98300 100644 --- a/rufus.sln +++ b/rufus.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.27004.2006 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "src\.msvc\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject @@ -25,129 +25,171 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm = Debug|arm + Debug|arm64 = Debug|arm64 Debug|x86_32 = Debug|x86_32 Debug|x86_64 = Debug|x86_64 Release|arm = Release|arm + Release|arm64 = Release|arm64 Release|x86_32 = Release|x86_32 Release|x86_64 = Release|x86_64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm.ActiveCfg = Debug|ARM {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm.Build.0 = Debug|ARM + {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm64.ActiveCfg = Debug|ARM64 + {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm64.Build.0 = Debug|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86_32.ActiveCfg = Debug|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86_32.Build.0 = Debug|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86_64.ActiveCfg = Debug|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86_64.Build.0 = Debug|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.ActiveCfg = Release|ARM {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.Build.0 = Release|ARM + {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.ActiveCfg = Release|ARM64 + {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.Build.0 = Release|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86_32.ActiveCfg = Release|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86_32.Build.0 = Release|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86_64.ActiveCfg = Release|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86_64.Build.0 = Release|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm.ActiveCfg = Debug|ARM {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm.Build.0 = Debug|ARM + {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm64.ActiveCfg = Debug|ARM64 + {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm64.Build.0 = Debug|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86_32.ActiveCfg = Debug|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86_32.Build.0 = Debug|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86_64.ActiveCfg = Debug|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86_64.Build.0 = Debug|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.ActiveCfg = Release|ARM {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.Build.0 = Release|ARM + {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.ActiveCfg = Release|ARM64 + {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.Build.0 = Release|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86_32.ActiveCfg = Release|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86_32.Build.0 = Release|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86_64.ActiveCfg = Release|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86_64.Build.0 = Release|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm.ActiveCfg = Debug|ARM {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm.Build.0 = Debug|ARM + {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm64.ActiveCfg = Debug|ARM64 + {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm64.Build.0 = Debug|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86_32.ActiveCfg = Debug|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86_32.Build.0 = Debug|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86_64.ActiveCfg = Debug|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86_64.Build.0 = Debug|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.ActiveCfg = Release|ARM {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.Build.0 = Release|ARM + {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.ActiveCfg = Release|ARM64 + {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.Build.0 = Release|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86_32.ActiveCfg = Release|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86_32.Build.0 = Release|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86_64.ActiveCfg = Release|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86_64.Build.0 = Release|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm.ActiveCfg = Debug|ARM {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm.Build.0 = Debug|ARM + {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm64.ActiveCfg = Debug|ARM64 + {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm64.Build.0 = Debug|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86_32.ActiveCfg = Debug|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86_32.Build.0 = Debug|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86_64.ActiveCfg = Debug|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86_64.Build.0 = Debug|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.ActiveCfg = Release|ARM {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.Build.0 = Release|ARM + {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.ActiveCfg = Release|ARM64 + {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.Build.0 = Release|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86_32.ActiveCfg = Release|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86_32.Build.0 = Release|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86_64.ActiveCfg = Release|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86_64.Build.0 = Release|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm.ActiveCfg = Debug|ARM {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm.Build.0 = Debug|ARM + {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm64.ActiveCfg = Debug|ARM64 + {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm64.Build.0 = Debug|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86_32.ActiveCfg = Debug|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86_32.Build.0 = Debug|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86_64.ActiveCfg = Debug|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86_64.Build.0 = Debug|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.ActiveCfg = Release|ARM {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.Build.0 = Release|ARM + {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.ActiveCfg = Release|ARM64 + {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.Build.0 = Release|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86_32.ActiveCfg = Release|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86_32.Build.0 = Release|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86_64.ActiveCfg = Release|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86_64.Build.0 = Release|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm.ActiveCfg = Debug|ARM {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm.Build.0 = Debug|ARM + {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm64.ActiveCfg = Debug|ARM64 + {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm64.Build.0 = Debug|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86_32.ActiveCfg = Debug|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86_32.Build.0 = Debug|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86_64.ActiveCfg = Debug|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86_64.Build.0 = Debug|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.ActiveCfg = Release|ARM {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.Build.0 = Release|ARM + {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.ActiveCfg = Release|ARM64 + {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.Build.0 = Release|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86_32.ActiveCfg = Release|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86_32.Build.0 = Release|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86_64.ActiveCfg = Release|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86_64.Build.0 = Release|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm.ActiveCfg = Debug|ARM {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm.Build.0 = Debug|ARM + {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm64.ActiveCfg = Debug|ARM64 + {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm64.Build.0 = Debug|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86_32.ActiveCfg = Debug|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86_32.Build.0 = Debug|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86_64.ActiveCfg = Debug|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86_64.Build.0 = Debug|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.ActiveCfg = Release|ARM {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.Build.0 = Release|ARM + {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.ActiveCfg = Release|ARM64 + {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.Build.0 = Release|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86_32.ActiveCfg = Release|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86_32.Build.0 = Release|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86_64.ActiveCfg = Release|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86_64.Build.0 = Release|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm.ActiveCfg = Debug|ARM {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm.Build.0 = Debug|ARM + {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm64.ActiveCfg = Debug|ARM64 + {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm64.Build.0 = Debug|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86_32.ActiveCfg = Debug|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86_32.Build.0 = Debug|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86_64.ActiveCfg = Debug|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86_64.Build.0 = Debug|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.ActiveCfg = Release|ARM {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.Build.0 = Release|ARM + {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.ActiveCfg = Release|ARM64 + {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.Build.0 = Release|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86_32.ActiveCfg = Release|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86_32.Build.0 = Release|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86_64.ActiveCfg = Release|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86_64.Build.0 = Release|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm.ActiveCfg = Debug|ARM {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm.Build.0 = Debug|ARM + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm64.ActiveCfg = Debug|ARM64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm64.Build.0 = Debug|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86_32.ActiveCfg = Debug|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86_32.Build.0 = Debug|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86_64.ActiveCfg = Debug|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86_64.Build.0 = Debug|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.ActiveCfg = Release|ARM {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.Build.0 = Release|ARM + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.ActiveCfg = Release|ARM64 + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.Build.0 = Release|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86_32.ActiveCfg = Release|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86_32.Build.0 = Release|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86_64.ActiveCfg = Release|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86_64.Build.0 = Release|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm.ActiveCfg = Debug|ARM {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm.Build.0 = Debug|ARM + {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm64.ActiveCfg = Debug|ARM64 + {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm64.Build.0 = Debug|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86_32.ActiveCfg = Debug|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86_32.Build.0 = Debug|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86_64.ActiveCfg = Debug|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86_64.Build.0 = Debug|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.ActiveCfg = Release|ARM {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.Build.0 = Release|ARM + {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.ActiveCfg = Release|ARM64 + {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.Build.0 = Release|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86_32.ActiveCfg = Release|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86_32.Build.0 = Release|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86_64.ActiveCfg = Release|x64 @@ -156,4 +198,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CCF051E2-A27D-48B0-94ED-ADC18A40E0DB} + EndGlobalSection EndGlobal diff --git a/src/.msvc/rufus.vcxproj b/src/.msvc/rufus.vcxproj index b4f6757d..585731ed 100644 --- a/src/.msvc/rufus.vcxproj +++ b/src/.msvc/rufus.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -38,7 +46,7 @@ Application Unicode true - v141_xp + v141 Application @@ -47,10 +55,17 @@ v141 true + + Application + Unicode + true + v141 + true + Application Unicode - v141_xp + v141 Application @@ -58,6 +73,12 @@ v141 true + + Application + Unicode + v141 + true + Application Unicode @@ -70,29 +91,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -101,21 +109,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - @@ -157,7 +159,32 @@ RequireAdministrator true Windows - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\arm;$(SolutionDir)\res\arm + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm + + + _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) + + + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\syslinux\win;..\libcdio;..\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + false + 4091;28252;28253;%(DisableSpecificWarnings) + + + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + true + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64 _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) @@ -233,7 +260,32 @@ RequireAdministrator false Windows - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\arm;$(SolutionDir)\res\arm + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm + + + _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) + + + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\syslinux\win;..\libcdio;..\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + false + 4091;28252;28253;%(DisableSpecificWarnings) + + + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + false + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64 _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) diff --git a/src/bled/.msvc/bled.vcxproj b/src/bled/.msvc/bled.vcxproj index 024bc3bd..eb87de9c 100644 --- a/src/bled/.msvc/bled.vcxproj +++ b/src/bled/.msvc/bled.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -68,6 +76,7 @@ bled {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} bled + 10.0.15063.0 @@ -81,6 +90,12 @@ v141 true + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode @@ -97,16 +112,28 @@ v141 true + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode v141 - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -115,21 +142,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -167,6 +188,24 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Level3 + ProgramDatabase + true + Disabled + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\.. + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level3 @@ -222,6 +261,24 @@ true + + + Level3 + true + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + MultiThreaded + ..\.. + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + true + + Level3 diff --git a/src/bled/platform.h b/src/bled/platform.h index 954abec9..f8819589 100644 --- a/src/bled/platform.h +++ b/src/bled/platform.h @@ -220,7 +220,7 @@ static __inline uint64_t bswap_64(uint64_t x) #elif defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN # define BB_BIG_ENDIAN 0 # define BB_LITTLE_ENDIAN 1 -#elif defined(__386__) || defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64) || (defined(_M_ARM)) +#elif defined(__386__) || defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || (defined(_M_ARM64)) # define BB_BIG_ENDIAN 0 # define BB_LITTLE_ENDIAN 1 #else diff --git a/src/getopt/.msvc/getopt.vcxproj b/src/getopt/.msvc/getopt.vcxproj index 3bbb4e2e..2c7321ab 100644 --- a/src/getopt/.msvc/getopt.vcxproj +++ b/src/getopt/.msvc/getopt.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -29,6 +37,7 @@ {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} getopt + 10.0.15063.0 @@ -44,6 +53,13 @@ v141 true + + StaticLibrary + Unicode + true + v141 + true + StaticLibrary Unicode @@ -55,6 +71,12 @@ v141 true + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode @@ -67,45 +89,32 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ - $(SolutionDir)x86_64\$(Configuration)\ - $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86_64\$(Configuration)\ + $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - - - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ + false + false + false + false + false + false + false + false @@ -135,6 +144,19 @@ true + + + HAVE_STRING_H;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + + + true + + X64 @@ -177,6 +199,18 @@ true + + + MaxSpeed + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreaded + Level3 + 28252;28253 + + + true + + X64 diff --git a/src/libcdio/driver/.msvc/driver.vcxproj b/src/libcdio/driver/.msvc/driver.vcxproj index 2c30ed0e..6e54d046 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj +++ b/src/libcdio/driver/.msvc/driver.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -61,6 +69,7 @@ Win32Proj driver libcdio-driver + 10.0.15063.0 @@ -76,6 +85,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -91,6 +107,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -105,29 +129,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -136,21 +147,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -186,6 +191,23 @@ + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + + + Windows + true + + + Level3 @@ -213,6 +235,20 @@ + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + + + Level3 diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj b/src/libcdio/iso9660/.msvc/iso9660.vcxproj index 454e5b01..c7037475 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -53,6 +61,7 @@ Win32Proj iso9660 libcdio-iso9660 + 10.0.15063.0 @@ -68,6 +77,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -83,6 +99,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -97,29 +121,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -128,21 +139,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -178,6 +183,23 @@ + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + + + Windows + true + + + Level3 @@ -205,6 +227,20 @@ + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + + + Level3 diff --git a/src/libcdio/udf/.msvc/udf.vcxproj b/src/libcdio/udf/.msvc/udf.vcxproj index 05effde4..5f4f7024 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj +++ b/src/libcdio/udf/.msvc/udf.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -47,6 +55,7 @@ Win32Proj udf libcdio-udf + 10.0.15063.0 @@ -62,6 +71,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -77,6 +93,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -91,29 +115,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -122,21 +133,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -172,6 +177,23 @@ + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + + + Windows + true + + + Level3 @@ -199,6 +221,20 @@ + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + + + Level3 diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj index f9559535..5628235e 100644 --- a/src/ms-sys/.msvc/ms-sys.vcxproj +++ b/src/ms-sys/.msvc/ms-sys.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -88,6 +96,7 @@ {2B1D078D-8EB4-4398-9CA4-23457265A7F6} Win32Proj mssys + 10.0.15063.0 @@ -103,6 +112,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -118,6 +134,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -132,29 +156,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -163,21 +174,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -216,6 +221,25 @@ + + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ../inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /analyze:stacksize32850 %(AdditionalOptions) + 28252;28253 + + + Windows + true + + + Level3 @@ -246,6 +270,22 @@ + + + Level3 + + + MaxSpeed + true + %(PreprocessorDefinitions) + ../inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /analyze:stacksize32850 %(AdditionalOptions) + 28252;28253 + + + Level3 diff --git a/src/rufus.rc b/src/rufus.rc index ceebae52..a2c37ce1 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.18.1211" +CAPTION "Rufus 2.18.1212" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -366,8 +366,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,18,1211,0 - PRODUCTVERSION 2,18,1211,0 + FILEVERSION 2,18,1212,0 + PRODUCTVERSION 2,18,1212,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -384,13 +384,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.18.1211" + VALUE "FileVersion", "2.18.1212" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.18.1211" + VALUE "ProductVersion", "2.18.1212" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj b/src/syslinux/libfat/.msvc/libfat.vcxproj index 2a880797..0bd089b6 100644 --- a/src/syslinux/libfat/.msvc/libfat.vcxproj +++ b/src/syslinux/libfat/.msvc/libfat.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -43,6 +51,7 @@ Win32Proj libfat syslinux-libfat + 10.0.15063.0 @@ -58,6 +67,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -73,6 +89,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -87,29 +111,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -118,21 +129,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -170,6 +175,24 @@ + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + + + Windows + true + + + Level3 @@ -199,6 +222,21 @@ + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4018;4244 + + + Level3 diff --git a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj index 878d8169..10deecc7 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj +++ b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -43,6 +51,7 @@ Win32Proj libinstaller syslinux-libinstaller + 10.0.15063.0 @@ -58,6 +67,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -73,6 +89,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -87,29 +111,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -118,21 +129,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -170,6 +175,24 @@ + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + + + Windows + true + + + Level3 @@ -199,6 +222,21 @@ + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267 + + + Level3 diff --git a/src/syslinux/win/.msvc/win.vcxproj b/src/syslinux/win/.msvc/win.vcxproj index bcd0d7b7..8ec983c4 100644 --- a/src/syslinux/win/.msvc/win.vcxproj +++ b/src/syslinux/win/.msvc/win.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -37,6 +45,7 @@ Win32Proj win syslinux-win + 10.0.15063.0 @@ -52,6 +61,13 @@ v141 true + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -67,6 +83,14 @@ v141 true + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -81,29 +105,16 @@ v141 - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_32\$(Configuration)\ @@ -112,21 +123,15 @@ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ - false false - false false + false + false + false + false false false - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - - - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - Level3 @@ -164,6 +169,24 @@ + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + + + Windows + true + + + Level3 @@ -193,6 +216,21 @@ + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + + + Level3