From 428fa8a909e73c55299b54058ae2ac4060506479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20K=C4=BCavi=C5=86=C5=A1?= Date: Mon, 29 Aug 2016 17:52:35 +0100 Subject: [PATCH] Fix tiny WIN32 problems building 32-bit debug and release projects. --- README.win32 | 4 ++-- win32/librdkafka.sln | 16 +++++++++++++++- win32/librdkafka.vcxproj | 6 +++--- win32/librdkafkacpp/librdkafkacpp.vcxproj | 8 ++++---- .../rdkafka_consumer_example_cpp.vcxproj | 13 ++++++++----- win32/rdkafka_example/rdkafka_example.vcxproj | 8 ++++---- win32/tests/tests.vcxproj | 8 ++++---- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/README.win32 b/README.win32 index 70c17846..0fc4aa14 100644 --- a/README.win32 +++ b/README.win32 @@ -1,11 +1,11 @@ -Native win32 build instructions using Microsoft Visual Studio (MSVC). +Native win32 build instructions using Microsoft Visual Studio 2013 (MSVC). Requirements: * zlib is installed automatically from NuGet, but probably requires the NuGet VS extension. * OpenSSL-win32 must be installed in C:\OpenSSL-win32. - Download and install the latest non-light package from: + Download and install the latest v1.0.2 non-light package from: https://slproweb.com/products/Win32OpenSSL.html (This would be using NuGet too but the current OpenSSL packages are outdated and with broken diff --git a/win32/librdkafka.sln b/win32/librdkafka.sln index 9c0c3ffe..fadfbf2b 100644 --- a/win32/librdkafka.sln +++ b/win32/librdkafka.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 @@ -94,6 +94,20 @@ Global {84585784-5BDC-43BE-B714-23EA2E7AEA5B}.Release|Win32.Build.0 = Release|Win32 {84585784-5BDC-43BE-B714-23EA2E7AEA5B}.Release|x64.ActiveCfg = Release|x64 {84585784-5BDC-43BE-B714-23EA2E7AEA5B}.Release|x64.Build.0 = Release|x64 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|Win32.ActiveCfg = Debug|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|Win32.Build.0 = Debug|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|x64.ActiveCfg = Debug|x64 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Debug|x64.Build.0 = Debug|x64 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|Any CPU.ActiveCfg = Release|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|Mixed Platforms.Build.0 = Release|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|Win32.ActiveCfg = Release|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|Win32.Build.0 = Release|Win32 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|x64.ActiveCfg = Release|x64 + {42009208-3AF5-481E-BE01-74DF7B0759D1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/librdkafka.vcxproj b/win32/librdkafka.vcxproj index 85c8492c..c5f13b42 100644 --- a/win32/librdkafka.vcxproj +++ b/win32/librdkafka.vcxproj @@ -34,20 +34,20 @@ DynamicLibrary true - v140 + v120 Unicode DynamicLibrary false - v140 + v120 true Unicode DynamicLibrary false - v140 + v120 true Unicode diff --git a/win32/librdkafkacpp/librdkafkacpp.vcxproj b/win32/librdkafkacpp/librdkafkacpp.vcxproj index c5c2debf..3b675205 100644 --- a/win32/librdkafkacpp/librdkafkacpp.vcxproj +++ b/win32/librdkafkacpp/librdkafkacpp.vcxproj @@ -1,4 +1,4 @@ - + @@ -35,20 +35,20 @@ DynamicLibrary true - v140 + v120 Unicode DynamicLibrary false - v140 + v120 true Unicode DynamicLibrary false - v140 + v120 true Unicode diff --git a/win32/rdkafka_consumer_example_cpp/rdkafka_consumer_example_cpp.vcxproj b/win32/rdkafka_consumer_example_cpp/rdkafka_consumer_example_cpp.vcxproj index 2c17e4f0..a0952a33 100644 --- a/win32/rdkafka_consumer_example_cpp/rdkafka_consumer_example_cpp.vcxproj +++ b/win32/rdkafka_consumer_example_cpp/rdkafka_consumer_example_cpp.vcxproj @@ -1,4 +1,4 @@ - + @@ -28,26 +28,26 @@ Application true - v140 + v120 Unicode Application false - v140 + v120 true Unicode Application true - v140 + v120 Unicode Application false - v140 + v120 true Unicode @@ -122,12 +122,15 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true + $(SolutionDir)/../src-cpp Console true true true + librdkafkacpp.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) + $(SolutionDir)\$(ConfigurationName) diff --git a/win32/rdkafka_example/rdkafka_example.vcxproj b/win32/rdkafka_example/rdkafka_example.vcxproj index ff2296fd..84524631 100644 --- a/win32/rdkafka_example/rdkafka_example.vcxproj +++ b/win32/rdkafka_example/rdkafka_example.vcxproj @@ -1,4 +1,4 @@ - + @@ -34,20 +34,20 @@ Application true - v140 + v120 Unicode Application false - v140 + v120 true Unicode Application false - v140 + v120 true Unicode diff --git a/win32/tests/tests.vcxproj b/win32/tests/tests.vcxproj index 120c5b30..9e7da464 100644 --- a/win32/tests/tests.vcxproj +++ b/win32/tests/tests.vcxproj @@ -33,20 +33,20 @@ Application true - v140 + v120 Unicode Application false - v140 + v120 true Unicode Application false - v140 + v120 true Unicode @@ -137,7 +137,7 @@ true true true - librdkafka.lib;librdkafkacpp.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) + librdkafka.lib;librdkafkacpp.lib;ws2_32.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) $(SolutionDir)\$(ConfigurationName) -- GitLab