From 23d71ae0f113ba55a152eafd144e5288d9a7c0fd Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 29 Mar 2016 13:11:04 +0100 Subject: [PATCH] [arm] add ARM compilation support (MSVC) * Yay! * Also remove unneeded stdint.h/stdbool.h/inttypes.h --- .gitignore | 1 - appveyor.yml | 2 +- rufus.sln | 44 ++- src/.msvc/rufus.vcxproj | 96 +++++- src/bled/.msvc/bled.vcxproj | 66 ++++ src/bled/platform.h | 2 +- src/getopt/.msvc/getopt.vcxproj | 60 ++++ src/libcdio/driver/.msvc/driver.vcxproj | 70 ++++ src/libcdio/iso9660/.msvc/iso9660.vcxproj | 70 ++++ src/libcdio/udf/.msvc/udf.vcxproj | 70 ++++ src/missing.h | 7 +- src/ms-sys/.msvc/ms-sys.vcxproj | 74 +++++ src/msvc-missing/inttypes.h | 299 ------------------ src/msvc-missing/stdbool.h | 16 - src/msvc-missing/stdint.h | 262 --------------- src/rufus.rc | 10 +- src/syslinux/libfat/.msvc/libfat.vcxproj | 72 +++++ .../libinstaller/.msvc/libinstaller.vcxproj | 72 +++++ src/syslinux/win/.msvc/win.vcxproj | 72 +++++ 19 files changed, 774 insertions(+), 591 deletions(-) delete mode 100644 src/msvc-missing/inttypes.h delete mode 100644 src/msvc-missing/stdbool.h delete mode 100644 src/msvc-missing/stdint.h diff --git a/.gitignore b/.gitignore index faa083d6..649eab04 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ *.idb *.ipch *.la -*.lib *.lo *.log *.mac diff --git a/appveyor.yml b/appveyor.yml index 55b22189..232f3942 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ init: if ($env:appveyor_repo_tag -eq "true") { Update-AppveyorBuild -Version "$env:appveyor_repo_tag_name" } else { - Update-AppveyorBuild -Version "dev-$($env:appveyor_repo_commit.substring(0,7))" + Update-AppveyorBuild -Version "dev-$($env:appveyor_repo_commit.substring(0,8))" } environment: diff --git a/rufus.sln b/rufus.sln index 5c694614..30c8f379 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.26228.9 +VisualStudioVersion = 15.0.26430.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rufus", "src\.msvc\rufus.vcxproj", "{731858A7-0303-4988-877B-9C0DD6471864}" EndProject @@ -24,88 +24,130 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bled", "src\bled\.msvc\bled EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|arm = Debug|arm Debug|x86_32 = Debug|x86_32 Debug|x86_64 = Debug|x86_64 + Release|arm = Release|arm 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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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|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 diff --git a/src/.msvc/rufus.vcxproj b/src/.msvc/rufus.vcxproj index f0e0c393..b4f6757d 100644 --- a/src/.msvc/rufus.vcxproj +++ b/src/.msvc/rufus.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM + Release Win32 @@ -23,6 +31,7 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj + 10.0.15063.0 @@ -31,11 +40,24 @@ true v141_xp + + Application + Unicode + true + v141 + true + Application Unicode v141_xp + + Application + Unicode + v141 + true + Application Unicode @@ -53,9 +75,15 @@ + + + + + + @@ -74,10 +102,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + @@ -92,7 +130,7 @@ Disabled - setupapi.lib;comctl32.lib;wininet.lib;shlwapi.lib;crypt32.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) RequireAdministrator true Windows @@ -102,6 +140,31 @@ _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.10586.0\um\arm;$(SolutionDir)\res\arm + + + _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) + + + + @@ -120,7 +183,7 @@ Disabled - setupapi.lib;comctl32.lib;wininet.lib;shlwapi.lib;crypt32.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) RequireAdministrator true Windows @@ -143,7 +206,7 @@ 4091;28252;28253;%(DisableSpecificWarnings) - setupapi.lib;comctl32.lib;wininet.lib;shlwapi.lib;crypt32.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) RequireAdministrator false Windows @@ -153,6 +216,31 @@ _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.10586.0\um\arm;$(SolutionDir)\res\arm + + + _UNICODE;UNICODE;RUFUS_LOC;%(PreprocessorDefinitions) + + + + @@ -169,7 +257,7 @@ 4091;28252;28253;%(DisableSpecificWarnings) - setupapi.lib;comctl32.lib;wininet.lib;shlwapi.lib;crypt32.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) + advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wininet.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) RequireAdministrator false Windows diff --git a/src/bled/.msvc/bled.vcxproj b/src/bled/.msvc/bled.vcxproj index 7720bd52..024bc3bd 100644 --- a/src/bled/.msvc/bled.vcxproj +++ b/src/bled/.msvc/bled.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM + Release Win32 @@ -67,6 +75,12 @@ Unicode v141 + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode @@ -77,6 +91,12 @@ Unicode v141 + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode @@ -96,10 +116,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -119,6 +149,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 @@ -156,6 +204,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 7345703a..954abec9 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) +#elif defined(__386__) || defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64) || (defined(_M_ARM)) # 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 0d91edf7..3bbb4e2e 100644 --- a/src/getopt/.msvc/getopt.vcxproj +++ b/src/getopt/.msvc/getopt.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM + Release Win32 @@ -29,11 +37,24 @@ true v141 + + StaticLibrary + Unicode + true + v141 + true + StaticLibrary Unicode v141 + + StaticLibrary + Unicode + v141 + true + StaticLibrary Unicode @@ -51,9 +72,15 @@ + + + + + + @@ -72,6 +99,14 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ + + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + + + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + HAVE_STRING_H;%(PreprocessorDefinitions) @@ -87,6 +122,19 @@ true + + + HAVE_STRING_H;%(PreprocessorDefinitions) + true + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + + + true + + X64 @@ -117,6 +165,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 b5d35884..2c30ed0e 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj +++ b/src/libcdio/driver/.msvc/driver.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -61,6 +69,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -68,6 +83,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -87,9 +110,15 @@ + + + + + + @@ -108,10 +137,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -130,6 +169,23 @@ MachineX86 + + + + + 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 @@ -143,6 +199,20 @@ MachineX86 + + + 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 f7422c56..454e5b01 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -53,6 +61,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -60,6 +75,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -79,9 +102,15 @@ + + + + + + @@ -100,10 +129,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -122,6 +161,23 @@ MachineX86 + + + + + 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 @@ -135,6 +191,20 @@ MachineX86 + + + 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 4892162f..05effde4 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj +++ b/src/libcdio/udf/.msvc/udf.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -47,6 +55,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -54,6 +69,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -73,9 +96,15 @@ + + + + + + @@ -94,10 +123,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -116,6 +155,23 @@ MachineX86 + + + + + 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 @@ -129,6 +185,20 @@ MachineX86 + + + 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/missing.h b/src/missing.h index 3c4f6cd2..6fabe57b 100644 --- a/src/missing.h +++ b/src/missing.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Constants and defines missing from various toolchains -* Copyright © 2016 Pete Batard +* Copyright © 2016-2017 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,7 +49,12 @@ #if defined(__GNUC__) || defined(__clang__) #define PREFETCH64(m) do { __builtin_prefetch(m, 0, 0); __builtin_prefetch(m+32, 0, 0); } while(0) #elif defined(_MSC_VER) +#if defined(_M_IX86) || defined (_M_X64) #define PREFETCH64(m) do { _m_prefetch(m); _m_prefetch(m+32); } while(0) +#else +// _m_prefetch() doesn't seem to exist for MSVC/ARM +#define PREFETCH64(m) +#endif #endif /* Read/write with endianness swap */ diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj index 0cfac813..f9559535 100644 --- a/src/ms-sys/.msvc/ms-sys.vcxproj +++ b/src/ms-sys/.msvc/ms-sys.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -88,6 +96,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -95,6 +110,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -114,9 +137,15 @@ + + + + + + @@ -135,10 +164,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -158,6 +197,25 @@ MachineX86 + + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ../inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /analyze:stacksize32850 %(AdditionalOptions) + 28252;28253 + + + Windows + true + + + Level3 @@ -172,6 +230,22 @@ MachineX86 + + + Level3 + + + MaxSpeed + true + %(PreprocessorDefinitions) + ../inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /analyze:stacksize32850 %(AdditionalOptions) + 28252;28253 + + + Level3 diff --git a/src/msvc-missing/inttypes.h b/src/msvc-missing/inttypes.h deleted file mode 100644 index 6d8c418b..00000000 --- a/src/msvc-missing/inttypes.h +++ /dev/null @@ -1,299 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file was original part of the w64 mingw-runtime package. - */ - -/* - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * Modified for libusb/MSVC: Pete Batard - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Date: 2010-04-02 - */ - -#ifndef _MSC_VER -#error This header should only be used with Microsoft compilers -#endif - -/* 7.8 Format conversion of integer types */ - -#ifndef _INTTYPES_H_ -#define _INTTYPES_H_ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - intmax_t quot; - intmax_t rem; - } imaxdiv_t; - - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) - -/* 7.8.1 Macros for format specifiers - * - * MS runtime does not yet understand C9x standard "ll" - * length specifier. It appears to treat "ll" as "l". - * The non-standard I64 length specifier causes warning in GCC, - * but understood by MS runtime functions. - */ - -/* fprintf macros for signed types */ -#define PRId8 "d" -#define PRId16 "d" -#define PRId32 "d" -#define PRId64 "I64d" - -#define PRIdLEAST8 "d" -#define PRIdLEAST16 "d" -#define PRIdLEAST32 "d" -#define PRIdLEAST64 "I64d" - -#define PRIdFAST8 "d" -#define PRIdFAST16 "d" -#define PRIdFAST32 "d" -#define PRIdFAST64 "I64d" - -#define PRIdMAX "I64d" - -#define PRIi8 "i" -#define PRIi16 "i" -#define PRIi32 "i" -#define PRIi64 "I64i" - -#define PRIiLEAST8 "i" -#define PRIiLEAST16 "i" -#define PRIiLEAST32 "i" -#define PRIiLEAST64 "I64i" - -#define PRIiFAST8 "i" -#define PRIiFAST16 "i" -#define PRIiFAST32 "i" -#define PRIiFAST64 "I64i" - -#define PRIiMAX "I64i" - -#define PRIo8 "o" -#define PRIo16 "o" -#define PRIo32 "o" -#define PRIo64 "I64o" - -#define PRIoLEAST8 "o" -#define PRIoLEAST16 "o" -#define PRIoLEAST32 "o" -#define PRIoLEAST64 "I64o" - -#define PRIoFAST8 "o" -#define PRIoFAST16 "o" -#define PRIoFAST32 "o" -#define PRIoFAST64 "I64o" - -#define PRIoMAX "I64o" - -/* fprintf macros for unsigned types */ -#define PRIu8 "u" -#define PRIu16 "u" -#define PRIu32 "u" -#define PRIu64 "I64u" - - -#define PRIuLEAST8 "u" -#define PRIuLEAST16 "u" -#define PRIuLEAST32 "u" -#define PRIuLEAST64 "I64u" - -#define PRIuFAST8 "u" -#define PRIuFAST16 "u" -#define PRIuFAST32 "u" -#define PRIuFAST64 "I64u" - -#define PRIuMAX "I64u" - -#define PRIx8 "x" -#define PRIx16 "x" -#define PRIx32 "x" -#define PRIx64 "I64x" - -#define PRIxLEAST8 "x" -#define PRIxLEAST16 "x" -#define PRIxLEAST32 "x" -#define PRIxLEAST64 "I64x" - -#define PRIxFAST8 "x" -#define PRIxFAST16 "x" -#define PRIxFAST32 "x" -#define PRIxFAST64 "I64x" - -#define PRIxMAX "I64x" - -#define PRIX8 "X" -#define PRIX16 "X" -#define PRIX32 "X" -#define PRIX64 "I64X" - -#define PRIXLEAST8 "X" -#define PRIXLEAST16 "X" -#define PRIXLEAST32 "X" -#define PRIXLEAST64 "I64X" - -#define PRIXFAST8 "X" -#define PRIXFAST16 "X" -#define PRIXFAST32 "X" -#define PRIXFAST64 "I64X" - -#define PRIXMAX "I64X" - -/* - * fscanf macros for signed int types - * NOTE: if 32-bit int is used for int_fast8_t and int_fast16_t - * (see stdint.h, 7.18.1.3), FAST8 and FAST16 should have - * no length identifiers - */ - -#define SCNd16 "hd" -#define SCNd32 "d" -#define SCNd64 "I64d" - -#define SCNdLEAST16 "hd" -#define SCNdLEAST32 "d" -#define SCNdLEAST64 "I64d" - -#define SCNdFAST16 "hd" -#define SCNdFAST32 "d" -#define SCNdFAST64 "I64d" - -#define SCNdMAX "I64d" - -#define SCNi16 "hi" -#define SCNi32 "i" -#define SCNi64 "I64i" - -#define SCNiLEAST16 "hi" -#define SCNiLEAST32 "i" -#define SCNiLEAST64 "I64i" - -#define SCNiFAST16 "hi" -#define SCNiFAST32 "i" -#define SCNiFAST64 "I64i" - -#define SCNiMAX "I64i" - -#define SCNo16 "ho" -#define SCNo32 "o" -#define SCNo64 "I64o" - -#define SCNoLEAST16 "ho" -#define SCNoLEAST32 "o" -#define SCNoLEAST64 "I64o" - -#define SCNoFAST16 "ho" -#define SCNoFAST32 "o" -#define SCNoFAST64 "I64o" - -#define SCNoMAX "I64o" - -#define SCNx16 "hx" -#define SCNx32 "x" -#define SCNx64 "I64x" - -#define SCNxLEAST16 "hx" -#define SCNxLEAST32 "x" -#define SCNxLEAST64 "I64x" - -#define SCNxFAST16 "hx" -#define SCNxFAST32 "x" -#define SCNxFAST64 "I64x" - -#define SCNxMAX "I64x" - -/* fscanf macros for unsigned int types */ - -#define SCNu16 "hu" -#define SCNu32 "u" -#define SCNu64 "I64u" - -#define SCNuLEAST16 "hu" -#define SCNuLEAST32 "u" -#define SCNuLEAST64 "I64u" - -#define SCNuFAST16 "hu" -#define SCNuFAST32 "u" -#define SCNuFAST64 "I64u" - -#define SCNuMAX "I64u" - -#ifdef _WIN64 -#define PRIdPTR "I64d" -#define PRIiPTR "I64i" -#define PRIoPTR "I64o" -#define PRIuPTR "I64u" -#define PRIxPTR "I64x" -#define PRIXPTR "I64X" -#define SCNdPTR "I64d" -#define SCNiPTR "I64i" -#define SCNoPTR "I64o" -#define SCNxPTR "I64x" -#define SCNuPTR "I64u" -#else -#define PRIdPTR "d" -#define PRIiPTR "i" -#define PRIoPTR "o" -#define PRIuPTR "u" -#define PRIxPTR "x" -#define PRIXPTR "X" -#define SCNdPTR "d" -#define SCNiPTR "i" -#define SCNoPTR "o" -#define SCNxPTR "x" - #define SCNuPTR "u" -#endif - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -/* - * no length modifier for char types prior to C9x - * MS runtime scanf appears to treat "hh" as "h" - */ - -/* signed char */ -#define SCNd8 "hhd" -#define SCNdLEAST8 "hhd" -#define SCNdFAST8 "hhd" - -#define SCNi8 "hhi" -#define SCNiLEAST8 "hhi" -#define SCNiFAST8 "hhi" - -#define SCNo8 "hho" -#define SCNoLEAST8 "hho" -#define SCNoFAST8 "hho" - -#define SCNx8 "hhx" -#define SCNxLEAST8 "hhx" -#define SCNxFAST8 "hhx" - -/* unsigned char */ -#define SCNu8 "hhu" -#define SCNuLEAST8 "hhu" -#define SCNuFAST8 "hhu" -#endif /* __STDC_VERSION__ >= 199901 */ - -#endif /* !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) */ - - -#ifdef __cplusplus -} -#endif - -#endif /* ndef _INTTYPES_H */ diff --git a/src/msvc-missing/stdbool.h b/src/msvc-missing/stdbool.h deleted file mode 100644 index ab4eccc3..00000000 --- a/src/msvc-missing/stdbool.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Workaround stdbool.h for WDK compilers - Public Domain */ - -#include - -#ifndef _STDBOOL -#define _STDBOOL - -#ifndef __cplusplus - -#define bool BOOL -#define false FALSE -#define true TRUE - -#endif - -#endif diff --git a/src/msvc-missing/stdint.h b/src/msvc-missing/stdint.h deleted file mode 100644 index 1914e6d9..00000000 --- a/src/msvc-missing/stdint.h +++ /dev/null @@ -1,262 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file was originally part of the w64 mingw-runtime package. - */ - -/* ISO C9x 7.18 Integer types - * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * Contributor: Danny Smith - * Modified for libusb/MSVC: Pete Batard - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Date: 2010-04-02 - */ - -#ifndef _MSC_VER -#error This header should only be used with Microsoft compilers -#endif - -#ifndef _STDINT_H -#define _STDINT_H - -#ifndef _INTPTR_T_DEFINED -#define _INTPTR_T_DEFINED -#ifndef __intptr_t_defined -#define __intptr_t_defined -#undef intptr_t -#ifdef _WIN64 - typedef __int64 intptr_t; -#else - typedef int intptr_t; -#endif /* _WIN64 */ -#endif /* __intptr_t_defined */ -#endif /* _INTPTR_T_DEFINED */ - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 - typedef unsigned __int64 uintptr_t; -#else - typedef unsigned int uintptr_t; -#endif /* _WIN64 */ -#endif /* __uintptr_t_defined */ -#endif /* _UINTPTR_T_DEFINED */ - -#ifndef _PTRDIFF_T_DEFINED -#define _PTRDIFF_T_DEFINED -#ifndef _PTRDIFF_T_ -#define _PTRDIFF_T_ -#undef ptrdiff_t -#ifdef _WIN64 - typedef __int64 ptrdiff_t; -#else - typedef int ptrdiff_t; -#endif /* _WIN64 */ -#endif /* _PTRDIFF_T_ */ -#endif /* _PTRDIFF_T_DEFINED */ - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif /* C++ */ -#endif /* _WCHAR_T_DEFINED */ - -#ifndef _WCTYPE_T_DEFINED -#define _WCTYPE_T_DEFINED -#ifndef _WINT_T -#define _WINT_T - typedef unsigned short wint_t; - typedef unsigned short wctype_t; -#endif /* _WINT_T */ -#endif /* _WCTYPE_T_DEFINED */ - -/* 7.18.1.1 Exact-width integer types */ -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -/* 7.18.1.2 Minimum-width integer types */ -typedef signed char int_least8_t; -typedef unsigned char uint_least8_t; -typedef short int_least16_t; -typedef unsigned short uint_least16_t; -typedef int int_least32_t; -typedef unsigned uint_least32_t; -typedef __int64 int_least64_t; -typedef unsigned __int64 uint_least64_t; - -/* 7.18.1.3 Fastest minimum-width integer types - * Not actually guaranteed to be fastest for all purposes - * Here we use the exact-width types for 8 and 16-bit ints. - */ -typedef __int8 int_fast8_t; -typedef unsigned __int8 uint_fast8_t; -typedef __int16 int_fast16_t; -typedef unsigned __int16 uint_fast16_t; -typedef __int32 int_fast32_t; -typedef unsigned __int32 uint_fast32_t; -typedef __int64 int_fast64_t; -typedef unsigned __int64 uint_fast64_t; - -/* 7.18.1.5 Greatest-width integer types */ -typedef __int64 intmax_t; -typedef unsigned __int64 uintmax_t; - -/* 7.18.2 Limits of specified-width integer types */ -#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS) - -/* 7.18.2.1 Limits of exact-width integer types */ -#define INT8_MIN (-128) -#define INT16_MIN (-32768) -#define INT32_MIN (-2147483647 - 1) -#define INT64_MIN (-9223372036854775807LL - 1) - -#define INT8_MAX 127 -#define INT16_MAX 32767 -#define INT32_MAX 2147483647 -#define INT64_MAX 9223372036854775807LL - -#define UINT8_MAX 255 -#define UINT16_MAX 65535 -#define UINT32_MAX 0xffffffffU /* 4294967295U */ -#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ - -/* 7.18.2.2 Limits of minimum-width integer types */ -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST64_MIN INT64_MIN - -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MAX INT64_MAX - -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -/* 7.18.2.3 Limits of fastest minimum-width integer types */ -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST64_MIN INT64_MIN - -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MAX INT64_MAX - -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -/* 7.18.2.4 Limits of integer types capable of holding - object pointers */ -#ifdef _WIN64 -#define INTPTR_MIN INT64_MIN -#define INTPTR_MAX INT64_MAX -#define UINTPTR_MAX UINT64_MAX -#else -#define INTPTR_MIN INT32_MIN -#define INTPTR_MAX INT32_MAX -#define UINTPTR_MAX UINT32_MAX -#endif - -/* 7.18.2.5 Limits of greatest-width integer types */ -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -/* 7.18.3 Limits of other integer types */ -#ifdef _WIN64 -#define PTRDIFF_MIN INT64_MIN -#define PTRDIFF_MAX INT64_MAX -#else -#define PTRDIFF_MIN INT32_MIN -#define PTRDIFF_MAX INT32_MAX -#endif - -#define SIG_ATOMIC_MIN INT32_MIN -#define SIG_ATOMIC_MAX INT32_MAX - -#ifndef SIZE_MAX -#ifdef _WIN64 -#define SIZE_MAX UINT64_MAX -#else -#define SIZE_MAX UINT32_MAX -#endif -#endif - -#ifndef WCHAR_MIN /* also in wchar.h */ -#define WCHAR_MIN 0U -#define WCHAR_MAX 0xffffU -#endif - -/* - * wint_t is unsigned short for compatibility with MS runtime - */ -#define WINT_MIN 0U -#define WINT_MAX 0xffffU - -#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */ - - -/* 7.18.4 Macros for integer constants */ -#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS) - -/* 7.18.4.1 Macros for minimum-width integer constants - - According to Douglas Gwyn : - "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC - 9899:1999 as initially published, the expansion was required - to be an integer constant of precisely matching type, which - is impossible to accomplish for the shorter types on most - platforms, because C99 provides no standard way to designate - an integer constant with width less than that of type int. - TC1 changed this to require just an integer constant - *expression* with *promoted* type." - - The trick used here is from Clive D W Feather. -*/ - -#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val)) -#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val)) -#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val)) -/* The 'trick' doesn't work in C89 for long long because, without - suffix, (val) will be evaluated as int, not intmax_t */ -#define INT64_C(val) val##i64 - -#define UINT8_C(val) (val) -#define UINT16_C(val) (val) -#define UINT32_C(val) (val##i32) -#define UINT64_C(val) val##ui64 - -/* 7.18.4.2 Macros for greatest-width integer constants */ -#define INTMAX_C(val) val##i64 -#define UINTMAX_C(val) val##ui64 - -#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ - -#endif diff --git a/src/rufus.rc b/src/rufus.rc index d7f883a0..03cd406c 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.15.1114" +CAPTION "Rufus 2.15.1115" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -334,8 +334,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,15,1114,0 - PRODUCTVERSION 2,15,1114,0 + FILEVERSION 2,15,1115,0 + PRODUCTVERSION 2,15,1115,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -352,13 +352,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.15.1114" + VALUE "FileVersion", "2.15.1115" 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.15.1114" + VALUE "ProductVersion", "2.15.1115" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj b/src/syslinux/libfat/.msvc/libfat.vcxproj index 085263ee..2a880797 100644 --- a/src/syslinux/libfat/.msvc/libfat.vcxproj +++ b/src/syslinux/libfat/.msvc/libfat.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -43,6 +51,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,6 +65,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -69,9 +92,15 @@ + + + + + + @@ -90,10 +119,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -113,6 +152,24 @@ MachineX86 + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + + + Windows + true + + + Level3 @@ -127,6 +184,21 @@ MachineX86 + + + 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 42cd58c0..878d8169 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj +++ b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -43,6 +51,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,6 +65,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -69,9 +92,15 @@ + + + + + + @@ -90,10 +119,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -113,6 +152,24 @@ MachineX86 + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + + + Windows + true + + + Level3 @@ -127,6 +184,21 @@ MachineX86 + + + 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 3bfe0982..bcd0d7b7 100644 --- a/src/syslinux/win/.msvc/win.vcxproj +++ b/src/syslinux/win/.msvc/win.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -44,6 +59,14 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + StaticLibrary true @@ -63,9 +86,15 @@ + + + + + + @@ -84,10 +113,20 @@ $(SolutionDir)x86_64\$(Configuration)\ $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ false + false false + false false false + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + Level3 @@ -107,6 +146,24 @@ MachineX86 + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + + + Windows + true + + + Level3 @@ -121,6 +178,21 @@ MachineX86 + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + + + Level3