diff --git a/BUILD.md b/BUILD.md index f78edb20..3a20ccd3 100644 --- a/BUILD.md +++ b/BUILD.md @@ -94,7 +94,7 @@ is not intended for production use. ### Windows -You will need Microsoft Visual Studio 2017 to compile freelan. All projects come +You will need Microsoft Visual Studio 2019 to compile freelan. All projects come with a `.vcxproj` file for all the targets (debug/release and x86/x64). The root directory also contains a solution file (`.sln`) that references all diff --git a/apps/freelan/freelan.vcxproj b/apps/freelan/freelan.vcxproj index 48395336..ed4cb40b 100644 --- a/apps/freelan/freelan.vcxproj +++ b/apps/freelan/freelan.vcxproj @@ -38,7 +38,7 @@ {FCABC429-7FB2-4453-89CB-D1A59A7D59F9} Win32Proj freelan - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -46,26 +46,26 @@ Application true - v141 + v142 Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode @@ -135,11 +135,11 @@ Console true - libiconv.lib;libeay32.lib;ssleay32.lib;libcurl.lib;boost_date_time-vc140-mt-gd.lib;boost_system-vc140-mt-gd.lib;boost_thread-vc140-mt-gd.lib;boost_program_options-vc140-mt-gd.lib;boost_filesystem-vc140-mt-gd.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + libiconv.lib;libcrypto.lib;libssl.lib;libcurl.lib;boost_date_time-vc140-mt-gd.lib;boost_system-vc140-mt-gd.lib;boost_thread-vc140-mt-gd.lib;boost_program_options-vc140-mt-gd.lib;boost_filesystem-vc140-mt-gd.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) HighestAvailable - c:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. @@ -171,11 +171,11 @@ Console true - libiconv.lib;libeay32.lib;ssleay32.lib;libcurl.lib;boost_date_time-vc140-mt-gd.lib;boost_system-vc140-mt-gd.lib;boost_thread-vc140-mt-gd.lib;boost_program_options-vc140-mt-gd.lib;boost_filesystem-vc140-mt-gd.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + libiconv.lib;libcrypto.lib;libssl.lib;libcurl.lib;boost_date_time-vc140-mt-gd.lib;boost_system-vc140-mt-gd.lib;boost_thread-vc140-mt-gd.lib;boost_program_options-vc140-mt-gd.lib;boost_filesystem-vc140-mt-gd.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) HighestAvailable - c:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. @@ -211,11 +211,11 @@ true true true - libiconv.lib;libeay32.lib;ssleay32.lib;libcurl.lib;boost_date_time-vc140-mt.lib;boost_system-vc140-mt.lib;boost_thread-vc140-mt.lib;boost_program_options-vc140-mt.lib;boost_filesystem-vc140-mt.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + libiconv.lib;libcrypto.lib;libssl.lib;libcurl.lib;boost_date_time-vc140-mt.lib;boost_system-vc140-mt.lib;boost_thread-vc140-mt.lib;boost_program_options-vc140-mt.lib;boost_filesystem-vc140-mt.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) HighestAvailable - c:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. @@ -251,11 +251,11 @@ true true true - libiconv.lib;libeay32.lib;ssleay32.lib;libcurl.lib;boost_date_time-vc140-mt.lib;boost_system-vc140-mt.lib;boost_thread-vc140-mt.lib;boost_program_options-vc140-mt.lib;boost_filesystem-vc140-mt.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + libiconv.lib;libcrypto.lib;libssl.lib;libcurl.lib;boost_date_time-vc140-mt.lib;boost_system-vc140-mt.lib;boost_thread-vc140-mt.lib;boost_program_options-vc140-mt.lib;boost_filesystem-vc140-mt.lib;libiconvplus.lib;libkfather.lib;libexecuteplus.lib;libcryptoplus.lib;libasiotap.lib;libfscp.lib;libmongooseplus.lib;libfreelan.lib;miniupnpc.lib;libminiupnpcplus.lib;crypt32.lib;Iphlpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) HighestAvailable - c:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. diff --git a/appveyor.yml b/appveyor.yml index dd2e9d8b..4640b098 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 2.3.{build} shallow_clone: true -image: Visual Studio 2017 +image: Visual Studio 2019 environment: matrix: @@ -21,11 +21,11 @@ init: - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%' install: - - cinst cmake + - cinst cmake python # Install python wheels, necessary to install SCons via pip - python -m pip install wheel # Install SCons - - python -m pip install scons==2.5.1 + - python -m pip install scons - scons --version before_build: @@ -33,13 +33,6 @@ before_build: - vcpkg install boost-asio boost-thread boost-system boost-program-options boost-filesystem boost-iostreams boost-random boost-foreach --triplet %PLATFORM%-windows-static - vcpkg install curl --triplet %PLATFORM%-windows-static - vcpkg install openssl --triplet %PLATFORM%-windows-static - # Updates vcpkg packages to have miniupnpc. - # As appveyor previously cache builds for all ports (boost, openssl...), we - # do that now to avoid to rebuild everything. - - cd C:\Tools\vcpkg - - git pull - - .\bootstrap-vcpkg.bat - - cd %APPVEYOR_BUILD_FOLDER% - vcpkg install miniupnpc --triplet %PLATFORM%-windows-static build_script: diff --git a/libs/asiotap/libasiotap.vcxproj b/libs/asiotap/libasiotap.vcxproj index 8dd19ad6..45d0358f 100644 --- a/libs/asiotap/libasiotap.vcxproj +++ b/libs/asiotap/libasiotap.vcxproj @@ -173,7 +173,7 @@ {9173624C-FFF7-4431-BB4A-FC30B13AD742} Win32Proj libasiotap - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -181,26 +181,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -269,7 +269,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -300,7 +300,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -335,7 +335,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -370,7 +370,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj b/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj index 8fec096c..4ae664db 100644 --- a/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj +++ b/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj @@ -23,32 +23,32 @@ {2DC3A022-8C0C-4364-A1F1-F134E885AB02} Win32Proj tapsetup - 10.0.17763.0 + 10.0.18362.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/libs/cryptoplus/include/cryptoplus/random/random.hpp b/libs/cryptoplus/include/cryptoplus/random/random.hpp index d8a0cfbd..9efd6dbe 100644 --- a/libs/cryptoplus/include/cryptoplus/random/random.hpp +++ b/libs/cryptoplus/include/cryptoplus/random/random.hpp @@ -54,6 +54,10 @@ #include #include +#ifdef WINDOWS +#include +#endif + namespace cryptoplus { namespace random @@ -272,12 +276,21 @@ namespace cryptoplus inline bool windows_event(UINT imsg, WPARAM wparam, LPARAM lparam) { - return (RAND_event(imsg, wparam, lparam) == 1); + static_cast(imsg); + static_cast(wparam); + static_cast(lparam); + + // according to OpenSSL 1.1.x documentation: + // - RAND_event and RAND_screen has been deprecated + // - RAND_event() calls RAND_poll() and returns RAND_status(). + // - RAND_screen calls RAND_poll(). + RAND_poll(); + return (RAND_status() == 1); } inline void windows_screen() { - RAND_screen(); + RAND_poll(); } #endif diff --git a/libs/cryptoplus/libcryptoplus.vcxproj b/libs/cryptoplus/libcryptoplus.vcxproj index 262b76e2..020af16b 100644 --- a/libs/cryptoplus/libcryptoplus.vcxproj +++ b/libs/cryptoplus/libcryptoplus.vcxproj @@ -110,7 +110,7 @@ {BABD5FDD-D2DC-44FE-B2A4-A21D3DD1F6C2} Win32Proj libcryptoplus - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -118,26 +118,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -204,7 +204,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -233,7 +233,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -265,7 +265,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -297,7 +297,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/executeplus/libexecuteplus.vcxproj b/libs/executeplus/libexecuteplus.vcxproj index 6a2bd2eb..c58eaea0 100644 --- a/libs/executeplus/libexecuteplus.vcxproj +++ b/libs/executeplus/libexecuteplus.vcxproj @@ -35,7 +35,7 @@ {67D44B66-2B37-4FEC-90AD-F3A64B5BA1F4} Win32Proj libexecuteplus - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -43,26 +43,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -129,7 +129,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -158,7 +158,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -191,7 +191,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -224,7 +224,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/freelan/libfreelan.vcxproj b/libs/freelan/libfreelan.vcxproj index 3714ea40..39f92275 100644 --- a/libs/freelan/libfreelan.vcxproj +++ b/libs/freelan/libfreelan.vcxproj @@ -64,7 +64,7 @@ {3BCC24B5-D624-47BC-AFED-BF540AFA29F8} Win32Proj libfreelan - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -72,26 +72,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -159,7 +159,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -189,7 +189,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -222,7 +222,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -255,7 +255,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/fscp/libfscp.vcxproj b/libs/fscp/libfscp.vcxproj index e47ed458..1a83a439 100644 --- a/libs/fscp/libfscp.vcxproj +++ b/libs/fscp/libfscp.vcxproj @@ -55,7 +55,7 @@ {D2906D5F-3E94-4376-814D-299B8F81E195} Win32Proj libfscp - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -63,26 +63,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -149,7 +149,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -178,7 +178,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -211,7 +211,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -244,7 +244,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/iconvplus/libiconvplus.vcxproj b/libs/iconvplus/libiconvplus.vcxproj index c16443d0..efb94d1c 100644 --- a/libs/iconvplus/libiconvplus.vcxproj +++ b/libs/iconvplus/libiconvplus.vcxproj @@ -35,7 +35,7 @@ {ACD7B910-1594-4192-9AE1-E805B2F5DB59} Win32Proj libiconvplus - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -43,26 +43,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -134,7 +134,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -168,7 +168,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -206,7 +206,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -244,7 +244,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/kfather/libkfather.vcxproj b/libs/kfather/libkfather.vcxproj index 305a1b2b..852ab86e 100644 --- a/libs/kfather/libkfather.vcxproj +++ b/libs/kfather/libkfather.vcxproj @@ -34,7 +34,7 @@ {FCBBDD58-4EF6-4EEF-8405-49E06F61364B} Win32Proj libkfather - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -42,26 +42,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -128,7 +128,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -157,7 +157,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -190,7 +190,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -223,7 +223,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/miniupnpcplus/libminiupnpcplus.vcxproj b/libs/miniupnpcplus/libminiupnpcplus.vcxproj index 2357a8b7..fc7b774e 100644 --- a/libs/miniupnpcplus/libminiupnpcplus.vcxproj +++ b/libs/miniupnpcplus/libminiupnpcplus.vcxproj @@ -32,7 +32,7 @@ {AC73E1D7-49E7-4A12-8555-588CA931932B} Win32Proj libminiupnpcplus - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -40,26 +40,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -126,7 +126,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -155,7 +155,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -188,7 +188,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -221,7 +221,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template diff --git a/libs/mongooseplus/libmongooseplus.vcxproj b/libs/mongooseplus/libmongooseplus.vcxproj index 8b891607..d14bf574 100644 --- a/libs/mongooseplus/libmongooseplus.vcxproj +++ b/libs/mongooseplus/libmongooseplus.vcxproj @@ -41,7 +41,7 @@ {70266482-33AC-449F-8356-0EC6FA0C1BBD} Win32Proj libmongooseplus - 10.0.17763.0 + 10.0.18362.0 x86-windows-static x64-windows-static @@ -49,26 +49,26 @@ StaticLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -141,7 +141,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -176,7 +176,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -215,7 +215,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template @@ -254,7 +254,7 @@ - C:\Python27\python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp + python.exe $(SolutionDir)\defines.py $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp Generating the common defines header. $(SolutionDir)\build\$(PlatformShortName)\$(Configuration)\include\defines.hpp $(SolutionDir)\VERSION;$(SolutionDir)\defines.hpp.template