From 1879d00bf928ecafeae17b306019dd0ded5721d0 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Sep 2018 09:12:05 +0200 Subject: [PATCH] Add support for ARM64 platform --- CredWrite/CredWrite.vcxproj | 57 +++++++++++-- EAPMethods/EAPTTLS/EAPTTLS.vcxproj | 55 +++++++++++-- EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj | 55 +++++++++++-- EAPMethods/MSIBuild/Makefile | Bin 33092 -> 33916 bytes EventMonitor/EventMonitor.vcxproj | 57 +++++++++++-- EventMonitor/MSIBuild/Makefile | Bin 26084 -> 26556 bytes GEANTLink.sln | 94 ++++++++++++++++++++++ MSI/Base/Main/Makefile | Bin 36434 -> 39044 bytes MSI/MSIBuild | 2 +- MSILocal.mak | Bin 15380 -> 0 bytes Makefile | Bin 210352 -> 44304 bytes MakefileLang.mak | Bin 0 -> 10662 bytes MakefileLangPlatCfg.mak | Bin 0 -> 5978 bytes MakefilePlat.mak | Bin 0 -> 4748 bytes MakefilePlatCfg.mak | Bin 0 -> 27168 bytes MsiUseFeature/MsiUseFeature.vcxproj | 57 +++++++++++-- README.md | 15 +++- WLANManager/MSIBuild/Makefile | Bin 10060 -> 10590 bytes WLANManager/WLANManager.vcxproj | 57 +++++++++++-- include/ARM64.props | 43 ++++++++++ include/MSIBuildCfg.mak | Bin 14070 -> 13682 bytes lib/EAPBase/build/EAPBase.vcxproj | 55 +++++++++++-- lib/EAPBase_UI/build/EAPBase_UI.vcxproj | 55 +++++++++++-- lib/EapHost/build/EapHost.vcxproj | 55 +++++++++++-- lib/EapHost_UI/build/EapHost_UI.vcxproj | 55 +++++++++++-- lib/Events/MSIBuild/Makefile | Bin 29388 -> 29888 bytes lib/Events/build/Events.vcxproj | 59 ++++++++++++-- lib/GTC/build/GTC.vcxproj | 55 +++++++++++-- lib/GTC_UI/build/GTC_UI.vcxproj | 55 +++++++++++-- lib/MSCHAPv2/build/MSCHAPv2.vcxproj | 55 +++++++++++-- lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj | 55 +++++++++++-- lib/PAP/build/PAP.vcxproj | 55 +++++++++++-- lib/PAP_UI/build/PAP_UI.vcxproj | 55 +++++++++++-- lib/TLS/build/TLS.vcxproj | 55 +++++++++++-- lib/TLS_UI/build/TLS_UI.vcxproj | 55 +++++++++++-- lib/TTLS/build/TTLS.vcxproj | 55 +++++++++++-- lib/TTLS_UI/build/TTLS_UI.vcxproj | 55 +++++++++++-- lib/WinStd | 2 +- lib/wxExtend | 2 +- output/.gitignore | 2 + 40 files changed, 1152 insertions(+), 175 deletions(-) delete mode 100644 MSILocal.mak create mode 100644 MakefileLang.mak create mode 100644 MakefileLangPlatCfg.mak create mode 100644 MakefilePlat.mak create mode 100644 MakefilePlatCfg.mak create mode 100644 include/ARM64.props diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index 685ae7b..ba53044 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + Application + true + Unicode + v141 + true + Application false @@ -51,42 +66,66 @@ Unicode v141 + + Application + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + + + @@ -96,7 +135,9 @@ Create Create Create + Create Create + Create diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj index 8c5ca98..2200a88 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + DynamicLibrary + true + Unicode + v141 + true + DynamicLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + DynamicLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -92,7 +129,9 @@ Create Create Create + Create Create + Create diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index 5cb109b..31b9d88 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + DynamicLibrary + true + Unicode + v141 + true + DynamicLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + DynamicLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -92,7 +129,9 @@ Create Create Create + Create Create + Create diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index e30290beb3f3d51ce298c65d16e7e61b1216695a..57cbbba5c764ac3d2e89124d61c7db56f153bc34 100644 GIT binary patch delta 480 zcmX@o#Pp|wX+w$NWCsBiPDh3y244m<29wFU{K}zl9s?&sHG>6%DT5mjS^}{XkgdyL zz+ebc3uKuvxB|t^fGi6jGz0QN28i-4%F)klrsRT z2a&oAMhuQXmO0pDGX`g%PF*111t{(WWVrxEEPyPKolZbKjzHQ3NY(<~X*gNYP;~Nx zfDM~fgrYb=o?-=CHo0Cxn?@eGsA@ggK$>r|nUuoh1rl6P`|>4qgK6N+$&KE&P}}s7 cq6_Hh&2>_4{*&1f6();hsetIs8CiG40Fk#(y#N3J delta 92 zcmey*lYm$l%G~#^A!>3M3U6!WkkMf*C@9{CEZ* s27d-;21g+6$q)sUcbP1hq&j&)F3aSET!qQcWCbRRB`IuPkb6fA00-_G#{d8T diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj index 1d3d869..eaef62c 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + Application + true + Unicode + v141 + true + Application false @@ -51,42 +66,66 @@ Unicode v141 + + Application + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + + + @@ -107,7 +146,9 @@ Create Create Create + Create Create + Create diff --git a/EventMonitor/MSIBuild/Makefile b/EventMonitor/MSIBuild/Makefile index 464cbe66af55476cc80a393340966ea468392004..4af0c6af8ae39007e22353c1bbc03bce9c31e480 100644 GIT binary patch delta 264 zcmaEInsLv0#tjMrljQg&=kSYhIx++?_%fI=m`py%ryC9DF>o?eGng}2Fc<-$GlMG- znlR`B)wwY^F_;2bCO~l$1{Wa95y&?Ks?`NzXP}5FP=y5$8vxm^K=qCcwLsGhCpQKj z-F!iyf)!*fE7+pRvZAKJG_Z1Vp_A?8d!kMdTQ)0-sas9H7N9qIS%AW1tw60!flovL DqoOf# delta 95 zcmdmUp7F_P#tjMrlk&I09);hA5!C%Vhfi{mETHDwE@a1tz-$Xl=d`^h5*z66_is diff --git a/GEANTLink.sln b/GEANTLink.sln index f63f45f..6675add 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -63,192 +63,286 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC_UI", "lib\GTC_UI\build\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|ARM64.Build.0 = Debug|ARM64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.ActiveCfg = Debug|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x64.Build.0 = Debug|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.ActiveCfg = Debug|Win32 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|x86.Build.0 = Debug|Win32 + {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.ActiveCfg = Release|ARM64 + {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|ARM64.Build.0 = Release|ARM64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.ActiveCfg = Release|Win32 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x86.Build.0 = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32 + {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.ActiveCfg = Debug|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.ActiveCfg = Debug|Win32 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x86.Build.0 = Debug|Win32 + {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.ActiveCfg = Release|ARM64 + {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|ARM64.Build.0 = Release|ARM64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.ActiveCfg = Release|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.ActiveCfg = Release|Win32 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x86.Build.0 = Release|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|ARM64.Build.0 = Debug|ARM64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.ActiveCfg = Debug|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.ActiveCfg = Debug|Win32 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x86.Build.0 = Debug|Win32 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.ActiveCfg = Release|ARM64 + {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|ARM64.Build.0 = Release|ARM64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.ActiveCfg = Release|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.ActiveCfg = Release|Win32 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x86.Build.0 = Release|Win32 + {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|ARM64.Build.0 = Debug|ARM64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.ActiveCfg = Debug|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.ActiveCfg = Debug|Win32 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x86.Build.0 = Debug|Win32 + {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.ActiveCfg = Release|ARM64 + {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|ARM64.Build.0 = Release|ARM64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.ActiveCfg = Release|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.ActiveCfg = Release|Win32 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x86.Build.0 = Release|Win32 + {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|ARM64.Build.0 = Debug|ARM64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.ActiveCfg = Debug|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.ActiveCfg = Debug|Win32 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x86.Build.0 = Debug|Win32 + {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.ActiveCfg = Release|ARM64 + {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|ARM64.Build.0 = Release|ARM64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.ActiveCfg = Release|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.ActiveCfg = Release|Win32 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x86.Build.0 = Release|Win32 + {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|ARM64.Build.0 = Debug|ARM64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.ActiveCfg = Debug|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.ActiveCfg = Debug|Win32 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x86.Build.0 = Debug|Win32 + {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.ActiveCfg = Release|ARM64 + {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|ARM64.Build.0 = Release|ARM64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.ActiveCfg = Release|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.ActiveCfg = Release|Win32 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x86.Build.0 = Release|Win32 + {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|ARM64.Build.0 = Debug|ARM64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.ActiveCfg = Debug|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.ActiveCfg = Debug|Win32 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x86.Build.0 = Debug|Win32 + {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.ActiveCfg = Release|ARM64 + {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|ARM64.Build.0 = Release|ARM64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.ActiveCfg = Release|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.ActiveCfg = Release|Win32 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x86.Build.0 = Release|Win32 + {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|ARM64.Build.0 = Debug|ARM64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.ActiveCfg = Debug|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.ActiveCfg = Debug|Win32 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x86.Build.0 = Debug|Win32 + {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.ActiveCfg = Release|ARM64 + {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|ARM64.Build.0 = Release|ARM64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.ActiveCfg = Release|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.ActiveCfg = Release|Win32 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x86.Build.0 = Release|Win32 + {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|ARM64.Build.0 = Debug|ARM64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.ActiveCfg = Debug|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.ActiveCfg = Debug|Win32 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x86.Build.0 = Debug|Win32 + {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.ActiveCfg = Release|ARM64 + {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|ARM64.Build.0 = Release|ARM64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.ActiveCfg = Release|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.ActiveCfg = Release|Win32 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x86.Build.0 = Release|Win32 + {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|ARM64.Build.0 = Debug|ARM64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.ActiveCfg = Debug|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.ActiveCfg = Debug|Win32 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x86.Build.0 = Debug|Win32 + {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.ActiveCfg = Release|ARM64 + {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|ARM64.Build.0 = Release|ARM64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.ActiveCfg = Release|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.ActiveCfg = Release|Win32 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x86.Build.0 = Release|Win32 + {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|ARM64.Build.0 = Debug|ARM64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.ActiveCfg = Debug|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.ActiveCfg = Debug|Win32 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x86.Build.0 = Debug|Win32 + {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.ActiveCfg = Release|ARM64 + {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|ARM64.Build.0 = Release|ARM64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.ActiveCfg = Release|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.ActiveCfg = Release|Win32 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x86.Build.0 = Release|Win32 + {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|ARM64.Build.0 = Debug|ARM64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.ActiveCfg = Debug|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.ActiveCfg = Debug|Win32 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x86.Build.0 = Debug|Win32 + {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.ActiveCfg = Release|ARM64 + {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|ARM64.Build.0 = Release|ARM64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.ActiveCfg = Release|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.ActiveCfg = Release|Win32 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x86.Build.0 = Release|Win32 + {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|ARM64.Build.0 = Debug|ARM64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.ActiveCfg = Debug|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.ActiveCfg = Debug|Win32 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x86.Build.0 = Debug|Win32 + {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.ActiveCfg = Release|ARM64 + {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|ARM64.Build.0 = Release|ARM64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.ActiveCfg = Release|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.ActiveCfg = Release|Win32 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x86.Build.0 = Release|Win32 + {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|ARM64.Build.0 = Debug|ARM64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.ActiveCfg = Debug|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.ActiveCfg = Debug|Win32 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x86.Build.0 = Debug|Win32 + {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.ActiveCfg = Release|ARM64 + {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|ARM64.Build.0 = Release|ARM64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.ActiveCfg = Release|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.ActiveCfg = Release|Win32 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x86.Build.0 = Release|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32 + {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|ARM64.Build.0 = Debug|ARM64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.ActiveCfg = Debug|Win32 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x86.Build.0 = Debug|Win32 + {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.ActiveCfg = Release|ARM64 + {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|ARM64.Build.0 = Release|ARM64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.ActiveCfg = Release|Win32 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x86.Build.0 = Release|Win32 + {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|ARM64.Build.0 = Debug|ARM64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.ActiveCfg = Debug|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.ActiveCfg = Debug|Win32 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x86.Build.0 = Debug|Win32 + {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.ActiveCfg = Release|ARM64 + {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|ARM64.Build.0 = Release|ARM64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.ActiveCfg = Release|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.ActiveCfg = Release|Win32 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x86.Build.0 = Release|Win32 + {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|ARM64.Build.0 = Debug|ARM64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.ActiveCfg = Debug|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.ActiveCfg = Debug|Win32 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x86.Build.0 = Debug|Win32 + {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.ActiveCfg = Release|ARM64 + {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|ARM64.Build.0 = Release|ARM64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.ActiveCfg = Release|Win32 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x86.Build.0 = Release|Win32 + {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|ARM64.Build.0 = Debug|ARM64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.ActiveCfg = Debug|Win32 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x86.Build.0 = Debug|Win32 + {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.ActiveCfg = Release|ARM64 + {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|ARM64.Build.0 = Release|ARM64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.ActiveCfg = Release|Win32 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x86.Build.0 = Release|Win32 + {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|ARM64.Build.0 = Debug|ARM64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.ActiveCfg = Debug|Win32 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x86.Build.0 = Debug|Win32 + {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.ActiveCfg = Release|ARM64 + {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|ARM64.Build.0 = Release|ARM64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.ActiveCfg = Release|Win32 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x86.Build.0 = Release|Win32 + {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|ARM64.Build.0 = Debug|ARM64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.ActiveCfg = Debug|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.Build.0 = Debug|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.ActiveCfg = Debug|Win32 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x86.Build.0 = Debug|Win32 + {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.ActiveCfg = Release|ARM64 + {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|ARM64.Build.0 = Release|ARM64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.ActiveCfg = Release|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.Build.0 = Release|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.ActiveCfg = Release|Win32 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x86.Build.0 = Release|Win32 + {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|ARM64.Build.0 = Debug|ARM64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.ActiveCfg = Debug|x64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.Build.0 = Debug|x64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.ActiveCfg = Debug|Win32 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x86.Build.0 = Debug|Win32 + {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.ActiveCfg = Release|ARM64 + {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|ARM64.Build.0 = Release|ARM64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.ActiveCfg = Release|x64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.Build.0 = Release|x64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.ActiveCfg = Release|Win32 diff --git a/MSI/Base/Main/Makefile b/MSI/Base/Main/Makefile index f45105871f37678e20c70ff49224bb9573ac6d40..1273255abeace33e7e14c16b0ec6fdf25f66a780 100644 GIT binary patch delta 840 zcmZWo&ubGw6n+WBS|q_@X~;r}+lE*Vk=7iJ;E!lUtH<`D7z9C7 zjC%0h#Djl;2W4&|1rfos7eW04{1c>j@SADu!5oJ9=IxvJec#(RUtgskyi30=XETRs zL?ezwF%wZjXStYlvn5)gHR@7CeLBh?ho6;|yPe@-`yl_$TZ5}~gDz8(+B8dd$p?x_ zP)IH{aHRqiVR=9vRY?L@%$ESC3e_mUs^ObY4k9(|E%JD7KH@j+GM}6!jQ6;20I3<>@>!MN}N;GSXQvlRN!~@pI1(wiR2M)pLLz4un z;C`p1S!eec*e*2q*DkMmy|8hBch2Q_r(_K_XcHn<(J5`c0g@Qxq1kJoi9i=lL`V?% zCe}cv7U4huNX;%GM7IHrFxF*atj|ms*e)OE?}@RloTW~Rw|hChRj_(DX$ulgQ_o1y zUaMHbxNaGzf$^>Tp#Ow45@O?7$9$j=`3?l=&Ijc1oGo~N-w5Cf{X{)pzMjiyrwLyv zEDyGf>tsS1<609JV=Mvvy1Cko1LT2Fw_3*noCHuEF@duliYlTK_c02__4dUw58W=$ zUs_Xt+@+~;RQZ#SW;hfplj$7GPm5+wQPrb+U^<3+EmR+&zMkLpRKmM`ECkhKGo88U4dU);pk*PQFZEXMdCW_-{>dDhDslUg*sa^m8 delta 149 zcmZqK$aHBA(*`x($zi-&tQ8Dq3?`EmV zGJ|{bG_@ke%~hHue47(24R|*naBEI0c|pJ?SxpxPR|Yo*1%_~j2!>#W5C#{9 xcm^K^e+Fj;MsX;M&&4JY<)-ZSk4BLK=EEK2|Y diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 951fbec..3701db4 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 951fbec79dc7ad60026d0a4c10ca329bad7d3458 +Subproject commit 3701db4606d3a12b0df949698696487509d07bc7 diff --git a/MSILocal.mak b/MSILocal.mak deleted file mode 100644 index eb0dab4917b9d9168a61c76d8fab99eaa616bd55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15380 zcmeHO?M@q45S_nN>N{*megrkK8`7edwo$-fn$|H0j1UqMvcU!`U|ic2=o|K>+MYAx zo84=#trT{b1+0}>@BNsMb7yAf&Ncu3^IX1`ujIJ|!>c40(v=(ONn1|jR0e2&BR}GL zBd=vqzQz3qw5`awG^K%2{V$+k^Oi7gL;l9xs?>(FeC{=HB*j2lxSxSTFnsPx9Wqgx z3-m?lR4}3=pQI2=G34jQIf^aNYbuAn(j3T@@@UF3=-;62689stb#Uj{W0hr~*fh{P z7|KVfIOPgHFcNS9XWxGvzCc;DcDrXvkW zpZEW@hq%=xTC^^%j;+$EN@DAEI+W7Z^a>--bX^*X|0Pgp!U8VQ_G&~wvz|cqK)wl=J%3vO-nQF62Ao?=07y{Og^Mu|RJ-gzidvK5SCd|AfDXMRd(X{sf06$hZ%jf|KBI>c#SK4O(W z$N{W~@u!Iv&YqJO@)CV3@;j`7{##T%IKGb9O+T@CKd*h!(Pg!%4bbJhP!2{s+U$n> zqSW0JM{Q|e4Ly6H+d&js)VXCHy$yb*4JFKYWxJLo`3|`8D#7Q8be^z_ zlW!C|XO~fnT7!jd!1Azf27RQtUMb{*MI=?7}GTyO`|-s(v{v3 z)ijG$^?7EgX%ykCG>!7iN>{!sY*h#M;H%`BrKS#H(=}UP%~IFUZ?aoepJ!I9O0HS2 z>L^d@%1;_^QRkiZc43anOz;93DD&vH{Dr&QDW)d}5x##(%);^^M?Mg-=sk{zc^|V9 zX4c$m9AgEU@p1QL+2Ia$ExX7KEAStG*D;UWcU^ZIHT1fAQy)}1`i>~V;+8SnQD$Dp zofxZW9o^fUppQFoXPKj!w41R7njB?2+jC^x*QmEGsW+wLQSs}RKfJ=s{(i8U||ij#Trt~+^)BZ|{vnUg86 zIEGee5yi=yC5F>uoRcUI2)f$Ow7Qg&H){kRiWQDxmj3H z`VJqSZ&p4_*T-It=g&Ox3v=}FY{BABm~9^nPaO(4^XLyz=NZUv$i5rkX(tvX1Y55o;cmw+OU?VdnM>`;{`@d+Ycc z=m|?zTX<4e!~TP(dpw)t2_6xsp@k=oyBNEQbCPYeyVLkNt=ZDT2H;1IA^Ohth#$|* z>i8XiLyqSZI{v&$5mx5oR)?$l402Sl21MCbnL9Z5JAn|xZzB3kqBRG< zxEP*8M!hp`Jol~icHe_2!CkC2{`7+Hw6LbnnoAOKZ89%^-;e|^mmek{nTd__kNn5x z@$BU3MrUH->|qw4$KMLG_#DkuoQ32qKHIJ>i|8D;KTIMv8(rs#$-G;P=EI1~akxIs zsO(#U^Ej^JEN8Y%eHN1+N=(iwXQt1LXLU)%TF}t*B0S_47Dy z^y#~kmgMcrc1LMhS4ce#+w!SD2Fvm_O4_bQsi$jI&Vtj3TGYhRPs_5R^dF0DMRiKU Kx_tW1zWxI|wJCi7 diff --git a/Makefile b/Makefile index 221fd266e09ef13875216b7f8fe38eba7300d8ce..7344290dbf6a6e9ca0c64a474aeb4aa3b51d7b10 100644 GIT binary patch delta 2430 zcmai0%}*0S6o1pLfMq54g#?ilBOVA;3Wb0~;zvLbC=Cb^G_6oesbHyXAxJpD)q^2S z!W6}XgYf{yVD``+IdS4IFvNHyiiUXR;M=t=hU^>CWV@O9eZ2X-o!Q;|sV;uCY?kEl zA4Bcsz0eH};DW1g25jJgF1P~^;TB%gGu)YXMVrlaS-9u6RU5JAFn-Xa@~y_}eD_>! z`o5GuXnHQTTP-DgzOWbvUD|H*UOuAA#9ET&EOk`zH%-^L{ic~=skEA6oT+;4_tO%u)^O<1 zOSC0FTiHj(zqcfWw}7pS{r9XaU9M4-x_psUCcS6bAI4MeL~>_^*{#W~kR@dig_D*G z`e3;SCSVxiFbb0pg%@ClK8Qd7{1C#i5cv5*=R0oCD{9U}=R-t4wBfG<9$}ExFawPk z@&EDam@aVRtT88E)+m?xOiMv-+D?3NDCc`JiaJVf(Q$?2E@qgF3(lFlJU(*Cw)_Mq z8u!mFJ8$kNKCQAuc^AeSh9FGge-HyT3wA}ktx{}aph_vYq(7H#xDP(Ki+6p{is6kw z@W>)9XhbJGPQ_N?M`<4d`;7IN2_Ql)5JQ1`FeDL(Nd!b&HBq@AUdedN6z>@XB)p0M zKCM0ssh2Dm5psbr3iL}N3qV*RAm$y!iUS}^3M-#Fp;w5I7+2_<(PwNreVdpy8xeAW zs3AaSHwsaSfY`o4Ed2ytaSg!>N_!>7DBhU7&J@j)B&-V6si>ygFeGbjF+qvTqFi?p zk&MG6!8>p&=2jCRwQ8>=timutSm}q0NYFgl4ikG6FCy=DV;xavM83Y)6fa8dr-(~Y z#kV@5+c6j?axr)gB%8K8My?Ne=B4om7uH|Ck{N6O literal 210352 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 KjpzTj8U6>1Da^9~ literal 0 HcmV?d00001 diff --git a/MakefileLangPlatCfg.mak b/MakefileLangPlatCfg.mak new file mode 100644 index 0000000000000000000000000000000000000000..53d06d3fbe18a53d8b3392be03f1d6228aabe8ac GIT binary patch literal 5978 zcmds*Z%<=Y5XR>%CVq#z?7mpyE_GSmDC%aRODoz10wpU632C8)Mkuwti1-ctQtI!S z>7l)~7^SFcmQ{>hpHNUDR#(6gBL)4p&aya@ri7rKh;{St;#9$23#LUi*wzq3AkQ1KVV_1BNC~ z9Z+T_{f?btz`qcQQ}32$;BrnFYyJUMl2idf*ksQ!jBJuwg^|GB0BeW0u04ZWi|1G` z&41**kK~xo>?LDGZHhR>K{hK|=_%-C)$oG&Dk_uICEjK48}8>$8I~-{{=4xo&AYOe zqD$ThFP%A(@YmT8W%%?O%5(Qi)9rtS6({fvnW9tw-J*0J*6Y_}XzS}ByYsnKuOTV)Xves-J zOf| zb-_wPwg#2z%PN=N^(!;d@<@^wb9nZ~C>F4e?6hd_@bab|5=E*%Ek?9@!JgPt=GN?6 zqCxpvay>-fpmr-yqTVn1+&Fc`W2y>YtsCJ`#Z$~y?JMV=-bA(IbM@g&dW-dy+ZAQv zxC+-mm^2ud{T5wzp-5Uh2c_)avY&VwU~3s)lm&lA55(*0Gys_s9%Z=@RgZ|xQHV)ya9%-EO1>ho7M9s=2YcTZ(% z+cWgPM4|erZtc%{jVJboI;0+Va*x+c%Ba+*mb_b?KVJu;H&nhwYS$7KHusZ@`j^-I zblR=mYBOLT(bou_|3gT4To5hy1MrU|8@;M^*vS1JKpN_gjRE=v`!oHb(;ue0yPF7(j+u%RLa_Xox zqLW^ook^!do$b_x%4T&&bYk6ycAZ{zm+|y9XTf^_#c+;1NgVkrMYk-jb611!NXgds zm#WTO9NT{S2)--!sp(6Tc3XWp2%k;LkWT8srKP%YX;MMMm*9HEPp8)!u^Ig1Y?Jo? z&9M&P$X8D9?qlt!1E1y{dG!%Ew*1Uc8AiQ!_w=1?FuW;Vg~eg|k#LzDmj literal 0 HcmV?d00001 diff --git a/MakefilePlat.mak b/MakefilePlat.mak new file mode 100644 index 0000000000000000000000000000000000000000..aa819ad33674642944d125869aa6fa974df1792b GIT binary patch literal 4748 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 Vq?@nHeq$mcz4{Xqs9W6W`#*}ouZREu literal 0 HcmV?d00001 diff --git a/MsiUseFeature/MsiUseFeature.vcxproj b/MsiUseFeature/MsiUseFeature.vcxproj index 1b0606c..da272a2 100644 --- a/MsiUseFeature/MsiUseFeature.vcxproj +++ b/MsiUseFeature/MsiUseFeature.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + Application + true + Unicode + v141 + true + Application false @@ -51,42 +66,66 @@ Unicode v141 + + Application + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + + + @@ -96,7 +135,9 @@ Create Create Create + Create Create + Create diff --git a/README.md b/README.md index 3913da1..e6ad383 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X clients for enterpr - Lockable network profile configuration ### Deployment -- Released as multi-lingual 32 and 64-bit MSI packages; Group Policy deployment supported +- Released as multi-lingual x86, x64, and ARM64 MSI packages; Group Policy deployment supported - [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/master/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages) - [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/master/CredWrite) for automated user credential import to Credential Manager - [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/master/WLANManager) to allow network profile configuration dialog shortcuts @@ -58,9 +58,9 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path. ### wxWidgets -GÉANTLink is using wxWidgets v3.1.1 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets). +GÉANTLink is using wxWidgets static libraries. Since upstream wxWidgets libraries don't support ARM64 yet, a clone with ARM64 support was prepared at [GitHub](https://github.com/Amebis/wxWidgets.git). -#### Compiling wxWidgets Win32 static libraries +#### Compiling wxWidgets x86 static libraries 1. Start _x86 Native Tools Command Prompt for VS 2017_ 2. Change working folder to `build\msw` 3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141` @@ -72,8 +72,15 @@ GÉANTLink is using wxWidgets v3.1.1 static libraries. Unfortunately, only dynam 3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64` 4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release` +#### Compiling wxWidgets ARM64 static libraries +1. Start command prompt +2. Change working folder to `build\msw` +3. Run: `"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=ARM64 USE_OPENGL=0 BUILD=release` + #### Specifying wxWidgets path -GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.1.1`). +GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`). ### Digital Signing of Build Outputs In order to have the build process digitally sign output files, one should provide the following: diff --git a/WLANManager/MSIBuild/Makefile b/WLANManager/MSIBuild/Makefile index 8e8ee553007c401cff9644a8f82104d4573b1116..74594fae6c4be7bb18fccaec9b403583c170e8e9 100644 GIT binary patch delta 233 zcmX@(cQ0szl)&V7A}Xwo3_%ROlk55QL%}QtGX@g|PKIg*XCQ6KV9sC!q@5Yu7<7Sb zQy|+E$T9&!3!scHkaS`&2FmLKNjC-;ptvQFc4Ke^VpAY#vH3s0E*p|X!lK6EG_i=G VcJf9k%gL8S9UxxXEG%Xz2mpABCd>c; delta 25 hcmcZ?bjELkl)z*=i4Bu|csMrC5{zQqY$u^02mpi42&e!6 diff --git a/WLANManager/WLANManager.vcxproj b/WLANManager/WLANManager.vcxproj index 85beb75..53bf032 100644 --- a/WLANManager/WLANManager.vcxproj +++ b/WLANManager/WLANManager.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + Application + true + Unicode + v141 + true + Application false @@ -51,42 +66,66 @@ Unicode v141 + + Application + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + + + @@ -96,7 +135,9 @@ Create Create Create + Create Create + Create diff --git a/include/ARM64.props b/include/ARM64.props new file mode 100644 index 0000000..6a05dbf --- /dev/null +++ b/include/ARM64.props @@ -0,0 +1,43 @@ + + + + + + + + + $(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath) + + + + wxNO_GL_LIB;%(PreprocessorDefinitions) + + + MachineARM64 + + + Windows + MachineARM64 + advapi32.lib;ole32.lib;oleaut32.lib;shell32.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 79738e71e01296f686260830d1e3c74f3cab705f..ab5390dd7c51d111bac57a971dd28854d8a35c8c 100644 GIT binary patch delta 462 zcmY*TO-lk%6up{XGudcbrm6J|!IT-DOb1(Pkp+FxqMzVGCPIp6VIa|}P0)>S?OH;3 z(Xvg@s&(`OYAX>D(W*N$A;p7t&OPs(^X}*Fd%btzK}nSH#iL_CBJ+;mu$jV_sN0uh)|k~Gja&FgNM<|> zS@X(-j^Az>U13Ad;zPJ@AU}=Rt<|0Y!!Pf z?^fUlG$>$0h@!|s&N6JnIwsgAy;yvY?VGL=X#ADkyRapA|5@XBmx`^bumA<9z#Nq5 z6hVPSy65RuNH3FauoCe+EE8LzZ#BvoDTAw&tx)0^8;KzArrI{V%q9o>#BnFhoJF#! mh5@^&04W(fQLp(_rsHrjXhIWhZ2C{cug+jUCvto4!~FxR;(U+* delta 1061 zcmeyA^(}Y9Bo6s-h6sjWh7bl9hIj@a27d-;21g+6$q>ch3KX-Q%qVI+c^^j(G3qvl zak4NHqi}K?7f}XImg6Q)-8LfC`SB2EUL7ynPCSVV|ZH-{*7^N9!()5+&Vi3vN?&1qsx z#3lVH;>3AEM + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -103,7 +140,9 @@ Create Create Create + Create Create + Create diff --git a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj index 6b9fae4..fa3c738 100644 --- a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj +++ b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -98,7 +135,9 @@ Create Create Create + Create Create + Create diff --git a/lib/EapHost/build/EapHost.vcxproj b/lib/EapHost/build/EapHost.vcxproj index 24097f5..64b3306 100644 --- a/lib/EapHost/build/EapHost.vcxproj +++ b/lib/EapHost/build/EapHost.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -97,7 +134,9 @@ Create Create Create + Create Create + Create diff --git a/lib/EapHost_UI/build/EapHost_UI.vcxproj b/lib/EapHost_UI/build/EapHost_UI.vcxproj index e122483..0cb1fbf 100644 --- a/lib/EapHost_UI/build/EapHost_UI.vcxproj +++ b/lib/EapHost_UI/build/EapHost_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -95,7 +132,9 @@ Create Create Create + Create Create + Create diff --git a/lib/Events/MSIBuild/Makefile b/lib/Events/MSIBuild/Makefile index 95a6c3b82b8a96e1d1df1dab27752a2d4ddde244..69a950c5b77e256a5f9884555550705c92d533a9 100644 GIT binary patch delta 241 zcmX@}l<~kz#toPFC(H1wusSjXG5Ah) + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -37,6 +45,13 @@ Unicode v141 + + DynamicLibrary + true + Unicode + v141 + true + DynamicLibrary false @@ -51,53 +66,81 @@ Unicode v141 + + DynamicLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + Document mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." + mc.exe "%(Identity)" -u -b -e "h" -h "$(IntDir)." -r "$(IntDir)." Compiling manifest... Compiling manifest... Compiling manifest... + Compiling manifest... Compiling manifest... + Compiling manifest... $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) + $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) + $(IntDir)EventsETW.h;$(IntDir)EventsETW.rc;$(IntDir)EventsETW_MSG00001.bin;$(IntDir)EventsETWTEMP.BIN;%(Outputs) Designer diff --git a/lib/GTC/build/GTC.vcxproj b/lib/GTC/build/GTC.vcxproj index 90bd6b1..6baabbc 100644 --- a/lib/GTC/build/GTC.vcxproj +++ b/lib/GTC/build/GTC.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -95,7 +132,9 @@ Create Create Create + Create Create + Create diff --git a/lib/GTC_UI/build/GTC_UI.vcxproj b/lib/GTC_UI/build/GTC_UI.vcxproj index e16e3cc..708120b 100644 --- a/lib/GTC_UI/build/GTC_UI.vcxproj +++ b/lib/GTC_UI/build/GTC_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -95,7 +132,9 @@ Create Create Create + Create Create + Create diff --git a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj index d6e7c3c..6d2dc34 100644 --- a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj +++ b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -97,7 +134,9 @@ Create Create Create + Create Create + Create diff --git a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj index cf9309a..27a89f5 100644 --- a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj +++ b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -93,7 +130,9 @@ Create Create Create + Create Create + Create diff --git a/lib/PAP/build/PAP.vcxproj b/lib/PAP/build/PAP.vcxproj index ab97780..c1d85e7 100644 --- a/lib/PAP/build/PAP.vcxproj +++ b/lib/PAP/build/PAP.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -95,7 +132,9 @@ Create Create Create + Create Create + Create diff --git a/lib/PAP_UI/build/PAP_UI.vcxproj b/lib/PAP_UI/build/PAP_UI.vcxproj index 885c116..556dce9 100644 --- a/lib/PAP_UI/build/PAP_UI.vcxproj +++ b/lib/PAP_UI/build/PAP_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -93,7 +130,9 @@ Create Create Create + Create Create + Create diff --git a/lib/TLS/build/TLS.vcxproj b/lib/TLS/build/TLS.vcxproj index bbe629d..fe15136 100644 --- a/lib/TLS/build/TLS.vcxproj +++ b/lib/TLS/build/TLS.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -94,7 +131,9 @@ Create Create Create + Create Create + Create diff --git a/lib/TLS_UI/build/TLS_UI.vcxproj b/lib/TLS_UI/build/TLS_UI.vcxproj index 6711f03..b128bf6 100644 --- a/lib/TLS_UI/build/TLS_UI.vcxproj +++ b/lib/TLS_UI/build/TLS_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -95,7 +132,9 @@ Create Create Create + Create Create + Create diff --git a/lib/TTLS/build/TTLS.vcxproj b/lib/TTLS/build/TTLS.vcxproj index 3de94ed..d3761bb 100644 --- a/lib/TTLS/build/TTLS.vcxproj +++ b/lib/TTLS/build/TTLS.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -101,7 +138,9 @@ Create Create Create + Create Create + Create diff --git a/lib/TTLS_UI/build/TTLS_UI.vcxproj b/lib/TTLS_UI/build/TTLS_UI.vcxproj index 58b4c34..f67b05c 100644 --- a/lib/TTLS_UI/build/TTLS_UI.vcxproj +++ b/lib/TTLS_UI/build/TTLS_UI.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -36,6 +44,13 @@ Unicode v141 + + StaticLibrary + true + Unicode + v141 + true + StaticLibrary false @@ -50,39 +65,61 @@ Unicode v141 + + StaticLibrary + false + true + Unicode + v141 + true + - - + + - - + + + + + + + + - - + + - - + + + + + + + + + + @@ -96,7 +133,9 @@ Create Create Create + Create Create + Create diff --git a/lib/WinStd b/lib/WinStd index 7f2515f..c8e387b 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 7f2515f54aab4fe1a4c0cec3542efc72cacf9e9d +Subproject commit c8e387b38f91e560826c2851ab21f80311555c29 diff --git a/lib/wxExtend b/lib/wxExtend index b161059..a49b49c 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit b16105985577ab3485d860926c5dcd7e6b32be2e +Subproject commit a49b49c3b037120ee4f1cbc0ca94f92fc6630138 diff --git a/output/.gitignore b/output/.gitignore index 3b22503..5892488 100644 --- a/output/.gitignore +++ b/output/.gitignore @@ -1,4 +1,6 @@ /*.tmp +/ARM64.Debug +/ARM64.Release /Win32.Debug /Win32.Release /x64.Debug