diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index ba53044..42ae807 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -30,26 +30,26 @@ {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} Win32Proj CredWrite - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 true @@ -57,21 +57,21 @@ false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 true @@ -156,7 +156,7 @@ {4d40cb8a-812e-4f12-b23a-31af743878e8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj index 2200a88..d4d4473 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj @@ -29,26 +29,26 @@ {331B6077-E3E2-4867-B93E-9D3F57280DE7} EAPTTLS - 10.0.17134.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 true @@ -162,7 +162,7 @@ {ee0ef0d9-a475-4038-8637-5754724f65b0} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index fd6eeff..e3e0b9e 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -29,26 +29,26 @@ {DD7A97CA-F18E-43B7-95C4-D06E6A291624} EAPTTLSUI - 10.0.17134.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 true @@ -183,10 +183,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 677e37d..17a911d 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -30,26 +30,26 @@ {E0D0725B-B2FC-4225-9481-CA9B1B6306F2} Win32Proj EventMonitor - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 true @@ -57,21 +57,21 @@ false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 true @@ -156,10 +156,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 6675add..6055d67 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -15,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-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}" EndProject @@ -45,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-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}" EndProject diff --git a/MsiUseFeature/MsiUseFeature.vcxproj b/MsiUseFeature/MsiUseFeature.vcxproj index da272a2..c3eaa52 100644 --- a/MsiUseFeature/MsiUseFeature.vcxproj +++ b/MsiUseFeature/MsiUseFeature.vcxproj @@ -30,26 +30,26 @@ {679D03C5-CD70-4FFA-93F8-A4AB3637509B} Win32Proj MsiUseFeature - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 true @@ -57,21 +57,21 @@ false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 true @@ -147,7 +147,7 @@ - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/README.md b/README.md index c87fe9a..f865602 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 2017 +- Microsoft Visual Studio 2019 - _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_ @@ -62,23 +62,23 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r 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 x86 static libraries -1. Start _x86 Native Tools Command Prompt for VS 2017_ +1. Start _x86 Native Tools Command Prompt for VS 2019_ 2. Change working folder to `build\msw` -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` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142 BUILD=release` #### Compiling wxWidgets x64 static libraries -1. Start _x64 Native Tools Command Prompt for VS 2017_ +1. Start _x64 Native Tools Command Prompt for VS 2019_ 2. Change working folder to `build\msw` -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` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142 TARGET_CPU=X64` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142 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` +3. Run: `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142 TARGET_CPU=ARM64 USE_OPENGL=0` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=142 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`). @@ -124,7 +124,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 -Open _x64 Native Tools Command Prompt for VS 2017_ for building. +Open _x64 Native Tools Command Prompt for VS 2019_ for building. Use Microsoft NMAKE to build the project. diff --git a/WLANManager/WLANManager.vcxproj b/WLANManager/WLANManager.vcxproj index 809ec2d..fedebee 100644 --- a/WLANManager/WLANManager.vcxproj +++ b/WLANManager/WLANManager.vcxproj @@ -30,26 +30,26 @@ {BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} Win32Proj WLANManager - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 true @@ -57,21 +57,21 @@ false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 true @@ -144,7 +144,7 @@ - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/lib/EAPBase/build/EAPBase.vcxproj b/lib/EAPBase/build/EAPBase.vcxproj index f9d7bc5..ddbbe6a 100644 --- a/lib/EAPBase/build/EAPBase.vcxproj +++ b/lib/EAPBase/build/EAPBase.vcxproj @@ -29,26 +29,26 @@ {AD6816A0-9600-4E01-8C49-39D03D1E791F} EAPBase - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj index fa3c738..3f2d28d 100644 --- a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj +++ b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj @@ -29,26 +29,26 @@ {D4B54856-BE1F-4937-A8F7-495125BE76BE} EAPBase_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/EapHost/build/EapHost.vcxproj b/lib/EapHost/build/EapHost.vcxproj index 64b3306..9f68f9c 100644 --- a/lib/EapHost/build/EapHost.vcxproj +++ b/lib/EapHost/build/EapHost.vcxproj @@ -29,26 +29,26 @@ {B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} EapHost - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/EapHost_UI/build/EapHost_UI.vcxproj b/lib/EapHost_UI/build/EapHost_UI.vcxproj index 0cb1fbf..89c6f13 100644 --- a/lib/EapHost_UI/build/EapHost_UI.vcxproj +++ b/lib/EapHost_UI/build/EapHost_UI.vcxproj @@ -29,26 +29,26 @@ {13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} EapHost_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/Events/build/Events.vcxproj b/lib/Events/build/Events.vcxproj index 0bd2196..bbb12c4 100644 --- a/lib/Events/build/Events.vcxproj +++ b/lib/Events/build/Events.vcxproj @@ -30,26 +30,26 @@ {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} Win32Proj Events - 10.0.17134.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 true @@ -57,21 +57,21 @@ false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 DynamicLibrary false true Unicode - v141 + v142 true diff --git a/lib/GTC/build/GTC.vcxproj b/lib/GTC/build/GTC.vcxproj index 6baabbc..9fe8b5b 100644 --- a/lib/GTC/build/GTC.vcxproj +++ b/lib/GTC/build/GTC.vcxproj @@ -29,26 +29,26 @@ {114A70BB-8698-4A0C-8C90-58F22EDD8129} GTC - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/GTC_UI/build/GTC_UI.vcxproj b/lib/GTC_UI/build/GTC_UI.vcxproj index 708120b..812c61e 100644 --- a/lib/GTC_UI/build/GTC_UI.vcxproj +++ b/lib/GTC_UI/build/GTC_UI.vcxproj @@ -29,26 +29,26 @@ {34680813-3A52-46FB-B5A8-1E4BBF770855} GTC_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj index 6d2dc34..515775b 100644 --- a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj +++ b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj @@ -29,26 +29,26 @@ {86A6D6A0-4B7D-4134-BE81-A5755C77584D} MSCHAPv2 - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj index 27a89f5..254e0bc 100644 --- a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj +++ b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj @@ -29,26 +29,26 @@ {7AF5B922-7C17-428A-97E0-09E3B41A684D} MSCHAPv2_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/PAP/build/PAP.vcxproj b/lib/PAP/build/PAP.vcxproj index c1d85e7..f43409d 100644 --- a/lib/PAP/build/PAP.vcxproj +++ b/lib/PAP/build/PAP.vcxproj @@ -29,26 +29,26 @@ {36B0CF8A-7794-46C3-8099-825BA962B4C7} PAP - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/PAP_UI/build/PAP_UI.vcxproj b/lib/PAP_UI/build/PAP_UI.vcxproj index 556dce9..dd0f706 100644 --- a/lib/PAP_UI/build/PAP_UI.vcxproj +++ b/lib/PAP_UI/build/PAP_UI.vcxproj @@ -29,26 +29,26 @@ {3D309C2E-64AB-4BC4-A16D-468571A2BC1A} PAP_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/TLS/build/TLS.vcxproj b/lib/TLS/build/TLS.vcxproj index fe15136..7ec3b58 100644 --- a/lib/TLS/build/TLS.vcxproj +++ b/lib/TLS/build/TLS.vcxproj @@ -29,26 +29,26 @@ {4D40CB8A-812E-4F12-B23A-31AF743878E8} TLS - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/TLS_UI/build/TLS_UI.vcxproj b/lib/TLS_UI/build/TLS_UI.vcxproj index b128bf6..4979f67 100644 --- a/lib/TLS_UI/build/TLS_UI.vcxproj +++ b/lib/TLS_UI/build/TLS_UI.vcxproj @@ -29,26 +29,26 @@ {9A25C261-8ADE-4938-8393-E857EF0E37E9} TLS_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/TTLS/build/TTLS.vcxproj b/lib/TTLS/build/TTLS.vcxproj index d3761bb..9e6f058 100644 --- a/lib/TTLS/build/TTLS.vcxproj +++ b/lib/TTLS/build/TTLS.vcxproj @@ -29,26 +29,26 @@ {EE0EF0D9-A475-4038-8637-5754724F65B0} TTLS - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/TTLS_UI/build/TTLS_UI.vcxproj b/lib/TTLS_UI/build/TTLS_UI.vcxproj index f67b05c..0f4a275 100644 --- a/lib/TTLS_UI/build/TTLS_UI.vcxproj +++ b/lib/TTLS_UI/build/TTLS_UI.vcxproj @@ -29,26 +29,26 @@ {42F0F0F4-C928-4860-A4E4-94991C2C3D90} TTLS_UI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true