diff --git a/.gitignore b/.gitignore index 3a2bb0d..f547040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -/*.opensdf -/*.suo -/*.sdf +/.vs /doc -/ipch diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index 2816d9b..685ae7b 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,34 @@ {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} Win32Proj CredWrite + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 @@ -110,7 +115,7 @@ {4d40cb8a-812e-4f12-b23a-31af743878e8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj index 92994de..8c5ca98 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,29 +21,34 @@ {331B6077-E3E2-4867-B93E-9D3F57280DE7} EAPTTLS + 10.0.17134.0 DynamicLibrary true Unicode + v141 DynamicLibrary true Unicode + v141 DynamicLibrary false true Unicode + v141 DynamicLibrary false true Unicode + v141 @@ -118,7 +123,7 @@ {ee0ef0d9-a475-4038-8637-5754724f65b0} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index 624b319..5cb109b 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,29 +21,34 @@ {DD7A97CA-F18E-43B7-95C4-D06E6A291624} EAPTTLSUI + 10.0.17134.0 DynamicLibrary true Unicode + v141 DynamicLibrary true Unicode + v141 DynamicLibrary false true Unicode + v141 DynamicLibrary false true Unicode + v141 @@ -139,10 +144,10 @@ {42f0f0f4-c928-4860-a4e4-94991c2c3d90} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {d3e29951-d9f5-486d-a167-20ae8e90b1fa} diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj index 21586b0..1d3d869 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,34 @@ {E0D0725B-B2FC-4225-9481-CA9B1B6306F2} Win32Proj EventMonitor + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 @@ -110,10 +115,10 @@ {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {d3e29951-d9f5-486d-a167-20ae8e90b1fa} diff --git a/GEANTLink.sln b/GEANTLink.sln index 42cf0b0..f63f45f 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}" ProjectSection(SolutionItems) = preProject README.md = README.md @@ -13,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTT EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}" EndProject @@ -43,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeat EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-10.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}" EndProject @@ -61,205 +63,206 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC_UI", "lib\GTC_UI\build\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Debug|Win32.Build.0 = Debug|Win32 {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}.Release|Win32.ActiveCfg = Release|Win32 - {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 - {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32 - {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|x64.Build.0 = Debug|x64 - {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.ActiveCfg = Release|Win32 - {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Release|x64.Build.0 = Release|x64 - {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Debug|x64.Build.0 = Debug|x64 - {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.ActiveCfg = Release|Win32 - {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}.Release|x64.Build.0 = Release|x64 - {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Debug|x64.Build.0 = Debug|x64 - {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.ActiveCfg = Release|Win32 - {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {DD7A97CA-F18E-43B7-95C4-D06E6A291624}.Release|x64.Build.0 = Release|x64 - {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Debug|x64.Build.0 = Debug|x64 - {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.ActiveCfg = Release|Win32 - {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {AD6816A0-9600-4E01-8C49-39D03D1E791F}.Release|x64.Build.0 = Release|x64 - {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Debug|x64.Build.0 = Debug|x64 - {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.ActiveCfg = Release|Win32 - {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {D4B54856-BE1F-4937-A8F7-495125BE76BE}.Release|x64.Build.0 = Release|x64 - {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.ActiveCfg = Debug|Win32 - {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Debug|x64.Build.0 = Debug|x64 - {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.ActiveCfg = Release|Win32 - {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {36B0CF8A-7794-46C3-8099-825BA962B4C7}.Release|x64.Build.0 = Release|x64 - {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.ActiveCfg = Debug|Win32 - {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Debug|x64.Build.0 = Debug|x64 - {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.ActiveCfg = Release|Win32 - {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {4D40CB8A-812E-4F12-B23A-31AF743878E8}.Release|x64.Build.0 = Release|x64 - {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Debug|x64.Build.0 = Debug|x64 - {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.ActiveCfg = Release|Win32 - {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {EE0EF0D9-A475-4038-8637-5754724F65B0}.Release|x64.Build.0 = Release|x64 - {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Debug|x64.Build.0 = Debug|x64 - {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.ActiveCfg = Release|Win32 - {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {3D309C2E-64AB-4BC4-A16D-468571A2BC1A}.Release|x64.Build.0 = Release|x64 - {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Debug|x64.Build.0 = Debug|x64 - {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.ActiveCfg = Release|Win32 - {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {9A25C261-8ADE-4938-8393-E857EF0E37E9}.Release|x64.Build.0 = Release|x64 - {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.ActiveCfg = Debug|Win32 - {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Debug|x64.Build.0 = Debug|x64 - {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.ActiveCfg = Release|Win32 - {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {42F0F0F4-C928-4860-A4E4-94991C2C3D90}.Release|x64.Build.0 = Release|x64 - {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.ActiveCfg = Debug|Win32 - {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Debug|x64.Build.0 = Debug|x64 - {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.ActiveCfg = Release|Win32 - {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {679D03C5-CD70-4FFA-93F8-A4AB3637509B}.Release|x64.Build.0 = Release|x64 - {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.ActiveCfg = Debug|Win32 - {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Debug|x64.Build.0 = Debug|x64 - {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.ActiveCfg = Release|Win32 - {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {E0D0725B-B2FC-4225-9481-CA9B1B6306F2}.Release|x64.Build.0 = Release|x64 - {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64 - {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32 - {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64 - {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.ActiveCfg = Debug|Win32 - {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64 - {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.ActiveCfg = Release|Win32 - {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64 - {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.ActiveCfg = Debug|Win32 - {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Debug|x64.Build.0 = Debug|x64 - {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.ActiveCfg = Release|Win32 - {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {86A6D6A0-4B7D-4134-BE81-A5755C77584D}.Release|x64.Build.0 = Release|x64 - {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Debug|x64.Build.0 = Debug|x64 - {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.ActiveCfg = Release|Win32 - {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64 - {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.ActiveCfg = Debug|Win32 - {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64 - {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.ActiveCfg = Release|Win32 - {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64 - {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.ActiveCfg = Debug|Win32 - {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64 - {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.ActiveCfg = Release|Win32 - {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64 - {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|Win32.ActiveCfg = Debug|Win32 - {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.Build.0 = Debug|x64 - {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|Win32.ActiveCfg = Release|Win32 - {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|Win32.Build.0 = Release|Win32 + {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|x64.ActiveCfg = Release|x64 {114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.Build.0 = Release|x64 - {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|Win32.ActiveCfg = Debug|Win32 - {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|Win32.Build.0 = Debug|Win32 + {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|x64.ActiveCfg = Debug|x64 {34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.Build.0 = Debug|x64 - {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|Win32.ActiveCfg = Release|Win32 - {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|Win32.Build.0 = Release|Win32 + {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|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 + {34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} - {DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} + {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} + {DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} {AD6816A0-9600-4E01-8C49-39D03D1E791F} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {D4B54856-BE1F-4937-A8F7-495125BE76BE} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {36B0CF8A-7794-46C3-8099-825BA962B4C7} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} @@ -268,16 +271,18 @@ Global {3D309C2E-64AB-4BC4-A16D-468571A2BC1A} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {9A25C261-8ADE-4938-8393-E857EF0E37E9} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {42F0F0F4-C928-4860-A4E4-94991C2C3D90} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} + {679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} + {E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} {D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} + {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} {86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {114A70BB-8698-4A0C-8C90-58F22EDD8129} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {34680813-3A52-46FB-B5A8-1E4BBF770855} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} - {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} - {679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} - {E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} - {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E52A6A8F-2AF5-43C7-8E01-9808E865BCF0} EndGlobalSection EndGlobal diff --git a/MSILocal.mak b/MSILocal.mak index 1f9b684..eb0dab4 100644 Binary files a/MSILocal.mak and b/MSILocal.mak differ diff --git a/Makefile b/Makefile index 75c2905..221fd26 100644 Binary files a/Makefile and b/Makefile differ diff --git a/MsiUseFeature/MsiUseFeature.vcxproj b/MsiUseFeature/MsiUseFeature.vcxproj index 4c05f7f..1b0606c 100644 --- a/MsiUseFeature/MsiUseFeature.vcxproj +++ b/MsiUseFeature/MsiUseFeature.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,34 @@ {679D03C5-CD70-4FFA-93F8-A4AB3637509B} Win32Proj MsiUseFeature + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 @@ -101,7 +106,7 @@ - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/README.md b/README.md index f470ec2..3913da1 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r ### Building Environment Requirements - Microsoft Windows Vista or later -- Microsoft Visual Studio 2010 SP1 +- Microsoft Visual Studio 2017 - _msgfmt.exe_ from [gettext](https://www.gnu.org/software/gettext/); Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add `GettextTools\bin` folder to the system path. - _sed.exe_ and _grep.exe_ @@ -61,16 +61,16 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r 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). #### Compiling wxWidgets Win32 static libraries -1. Start _Visual Studio Command Prompt (2010)_ +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=100` -4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 BUILD=release` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release` #### Compiling wxWidgets x64 static libraries -1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_ +1. Start _x64 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=100 TARGET_CPU=X64` -4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 TARGET_CPU=X64 BUILD=release` +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` #### 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`). @@ -93,7 +93,7 @@ GÉANTLink has some submodules. When cloning Git repository, make sure to use `- After clone is complete, grant _Users_ local group read and execute permissions to `output` subfolder (when working folder is private). This allows _EapHost_ service to load GÉANTLink's DLL, and Event Viewer to display GÉANTLink events. -GÉANTLink can be build and debugged opening _GEANTLink.sln_ in Visual C++ 2010 IDE. +GÉANTLink can be build and debugged opening _GEANTLink.sln_ in Visual C++ IDE. Before one can attempt to debug EAP DLLs, you should run `nmake register` from an elevated command prompt. See _Building in command line_ chapter below. @@ -116,7 +116,7 @@ A few seconds after desired function call has finished, _DllHost.exe_ terminates To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts. #### Building in command line -Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the system path. +Open _x64 Native Tools Command Prompt for VS 2017_ for building. Use Microsoft NMAKE to build the project. diff --git a/WLANManager/WLANManager.vcxproj b/WLANManager/WLANManager.vcxproj index 5fb6947..85beb75 100644 --- a/WLANManager/WLANManager.vcxproj +++ b/WLANManager/WLANManager.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,34 @@ {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} Win32Proj WLANManager + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 @@ -98,7 +103,7 @@ - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/include/Debug.props b/include/Debug.props index 7a0be7d..f4916a3 100644 --- a/include/Debug.props +++ b/include/Debug.props @@ -1,6 +1,6 @@