diff --git a/lib/cpp/3rdparty.props b/lib/cpp/3rdparty.props index 528d40a0b7..63d7830d9a 100644 --- a/lib/cpp/3rdparty.props +++ b/lib/cpp/3rdparty.props @@ -2,9 +2,10 @@ - $(THIRD_PARTY)\boost\boost_1_47_0 - $(THIRD_PARTY)\openssl\OpenSSL-Win32 - $(THIRD_PARTY)\libevent-2.0.21-stable + C:\boost-1.76.0 + C:\openssl-1.1.1k\win64 + C:\openssl-1.1.1k\win32 + C:\libevent-2.0.21 @@ -13,8 +14,12 @@ $(BOOST_ROOT) true - - $(OPENSSL_ROOT_DIR) + + $(OPENSSL64_ROOT_DIR) + true + + + $(OPENSSL32_ROOT_DIR) true @@ -22,4 +27,4 @@ true - \ No newline at end of file + diff --git a/lib/cpp/README.md b/lib/cpp/README.md index 8074484f19..83f14f90b3 100755 --- a/lib/cpp/README.md +++ b/lib/cpp/README.md @@ -70,7 +70,8 @@ you run into problems or want to redirect thrift to build and link against your own provided third party libraries: BOOST_ROOT : For boost, e.g. D:\boost_1_55_0 -OPENSSL_ROOT_DIR : For OpenSSL, e.g. D:\OpenSSL-Win32 +OPENSSL64_ROOT_DIR : For 64-bit OpenSSL, e.g. D:\OpenSSL-Win64 +OPENSSL32_ROOT_DIR : For 32-bit OpenSSL, e.g. D:\OpenSSL-Win32 only required by libthriftnb: diff --git a/lib/cpp/libthrift.vcxproj b/lib/cpp/libthrift.vcxproj index 2353cd39a5..68130f4d83 100644 --- a/lib/cpp/libthrift.vcxproj +++ b/lib/cpp/libthrift.vcxproj @@ -35,93 +35,140 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {DD26F57E-60F2-4F37-A616-D219A9BF338F} @@ -134,45 +181,53 @@ StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 @@ -211,35 +266,35 @@ - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL32_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL32_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL64_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL64_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL32_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL32_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL64_ROOT_DIR)\include\;$(IncludePath) - $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath) + $(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL64_ROOT_DIR)\include\;$(IncludePath) NotUsing Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthrift.pdb MultiThreadedDebugDLL @@ -253,7 +308,7 @@ NotUsing Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthrift.pdb MultiThreadedDebugDll @@ -267,7 +322,7 @@ NotUsing Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDll @@ -280,7 +335,7 @@ NotUsing Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDll @@ -295,7 +350,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthrift.pdb MultiThreadedDll @@ -313,7 +368,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthrift.pdb MultiThreadedDll @@ -331,7 +386,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDll @@ -348,7 +403,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDll diff --git a/lib/cpp/libthrift.vcxproj.filters b/lib/cpp/libthrift.vcxproj.filters index 0e9a9fde1c..c45a56f447 100644 --- a/lib/cpp/libthrift.vcxproj.filters +++ b/lib/cpp/libthrift.vcxproj.filters @@ -1,180 +1,154 @@  - - transport - - - - - windows - - - transport - - - windows - - + + {04761ce0-1dd8-45f3-8e82-ec8d56916109} + + + {5c6ca86e-f770-486e-959a-db86bb95e782} + + + {4f93d3cc-8369-4917-a4f3-67b66db9059d} + + + {dee84866-542d-45a7-9f9f-7e62429ff5c9} + + + {cdb85d59-f6ae-4704-816d-56ff086bd706} + + + {58c18c60-fe26-4b45-9262-494736796ef4} + + + {b17d48c5-4f55-4d47-8c7a-3c0943beb021} + + + + + async + + + async + + + async + + + async + + + async + + + async + + concurrency - - + + concurrency - - + + concurrency - - - protocol - - - protocol - - - protocol - - - protocol - - - transport - - - transport - - - transport - - - transport - - - transport - - - transport - - - transport - - - transport - - - server - - - server - - - server - - - async - - - async - - - processor - - - transport - - - transport - - - windows - - - windows - - + + concurrency - - + + concurrency - - - windows - - - transport - - - transport - - - - - transport - - transport + + concurrency + + + concurrency + + + concurrency + + + processor + + + processor + + + processor + + + protocol protocol - - - - - windows + + protocol - - windows + + protocol - - concurrency + + protocol - - transport + + protocol - - transport + + protocol - - transport + + protocol - - windows + + protocol - - transport + + protocol - - windows + + protocol - + + protocol + + + protocol + + + protocol + + protocol protocol + + server + server - + server - + server server - - async + + server - - async + + transport - - processor + + transport - - processor + + transport transport @@ -188,81 +162,235 @@ transport - + transport - + + transport + + + transport + + + transport + + + transport + + transport transport - - protocol + + transport - - protocol + + transport - - protocol + + transport - + transport + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + windows + + + windows + windows - + windows windows - + windows - + windows - - transport - - - transport + + windows + + + + + + + + + + - - {07ced19b-b72a-4105-9ffb-6d2bcf64497e} - - - {e9f61404-1148-4103-bd6f-e5869d37fa79} - - - {2814002a-3c68-427e-b0eb-33acd2f406ae} - - - {addd4707-dbaa-4d0c-bef6-fff8be7b495a} - - - {f55a8e9b-6959-487f-a396-c31b4d6c61d6} - - - {d526885b-1b3e-4ee3-8027-e694fe98ad63} - - - {8f428da8-5a83-44fb-9578-de935fb415e1} - - - {eea10406-3380-4f2d-9365-c26fa2875dae} - + + async + + + async + + + async + + + concurrency + + + concurrency + + + concurrency + + + concurrency + + + concurrency + + + concurrency + + + processor + + + protocol + + + protocol + + + protocol + + + protocol + + + protocol + + + server + + + server + + + server + + + server + + + server + + + server + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + transport + + + windows + + + windows + + + windows + + + windows + + + windows + + + + protocol - - windows\tr1 + + protocol - + \ No newline at end of file diff --git a/lib/cpp/libthriftnb.vcxproj b/lib/cpp/libthriftnb.vcxproj index dc6764e036..2c85cb3369 100755 --- a/lib/cpp/libthriftnb.vcxproj +++ b/lib/cpp/libthriftnb.vcxproj @@ -35,7 +35,6 @@ - @@ -43,7 +42,6 @@ - @@ -64,45 +62,53 @@ StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 StaticLibrary false true MultiByte + v142 @@ -170,7 +176,7 @@ Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthriftnb.pdb MultiThreadedDebugDll @@ -185,7 +191,7 @@ Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthriftnb.pdb MultiThreadedDebugDll @@ -200,7 +206,7 @@ Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDll @@ -214,7 +220,7 @@ Level3 Disabled - HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDll @@ -230,7 +236,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthriftnb.pdb MultiThreadedDll @@ -249,7 +255,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)libthriftnb.pdb MultiThreadedDll @@ -268,7 +274,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDll @@ -286,7 +292,7 @@ MaxSpeed true true - HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + HAVE_CONFIG_H=1;PACKAGE_VERSION="0.14.1";thrift_EXPORTS=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDll diff --git a/lib/cpp/libthriftnb.vcxproj.filters b/lib/cpp/libthriftnb.vcxproj.filters index 85703dd129..c08a7ab892 100644 --- a/lib/cpp/libthriftnb.vcxproj.filters +++ b/lib/cpp/libthriftnb.vcxproj.filters @@ -24,12 +24,6 @@ async - - async - - - windows - transport @@ -47,15 +41,9 @@ async - - async - windows - - windows - windows @@ -72,4 +60,4 @@ transport - + \ No newline at end of file diff --git a/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc b/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc index 16780911c4..0b70f0ad32 100644 --- a/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc +++ b/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc @@ -21,7 +21,7 @@ #include -#include "thrift/config.h" +#include /* * TCompactProtocol::i*ToZigzag depend on the fact that the right shift diff --git a/lib/cpp/src/thrift/transport/THttpClient.cpp b/lib/cpp/src/thrift/transport/THttpClient.cpp index ea2eb99af6..d7b046ad0b 100644 --- a/lib/cpp/src/thrift/transport/THttpClient.cpp +++ b/lib/cpp/src/thrift/transport/THttpClient.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/lib/cpp/src/thrift/transport/THttpServer.cpp b/lib/cpp/src/thrift/transport/THttpServer.cpp index 91a1c39afc..b4aad2d8f0 100644 --- a/lib/cpp/src/thrift/transport/THttpServer.cpp +++ b/lib/cpp/src/thrift/transport/THttpServer.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #if defined(_MSC_VER) || defined(__MINGW32__) diff --git a/lib/cpp/src/thrift/transport/TWebSocketServer.h b/lib/cpp/src/thrift/transport/TWebSocketServer.h index 7f39f36b95..0bae736e02 100644 --- a/lib/cpp/src/thrift/transport/TWebSocketServer.h +++ b/lib/cpp/src/thrift/transport/TWebSocketServer.h @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include