diff --git a/lib/librdkafka-2.4.0/packaging/nuget/templates/librdkafka.redist.nuspec b/lib/librdkafka-2.4.0/packaging/nuget/templates/librdkafka.redist.nuspec
index dbfd7b1aa71..f88b31d52e1 100644
--- a/lib/librdkafka-2.4.0/packaging/nuget/templates/librdkafka.redist.nuspec
+++ b/lib/librdkafka-2.4.0/packaging/nuget/templates/librdkafka.redist.nuspec
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
-  <metadata>
-    <id>librdkafka.redist</id>
-    <version>${version}</version>
-    <title>librdkafka - redistributable</title>
-    <authors>Magnus Edenhill, edenhill</authors>
-    <owners>Confluent Inc.</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/confluentinc/librdkafka/blob/master/LICENSES.txt</licenseUrl>
-    <projectUrl>https://github.com/confluentinc/librdkafka</projectUrl>
-    <description>The Apache Kafka C/C++ client library - redistributable</description>
-    <summary>The Apache Kafka C/C++ client library</summary>
-    <releaseNotes>Release of librdkafka</releaseNotes>
-    <copyright>Copyright 2012-2023</copyright>
-    <tags>native apache kafka librdkafka C C++ nativepackage</tags>
-  </metadata>
-  <files>
-    <file src="**" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
+  <metadata>
+    <id>librdkafka.redist</id>
+    <version>${version}</version>
+    <title>librdkafka - redistributable</title>
+    <authors>Magnus Edenhill, edenhill</authors>
+    <owners>Confluent Inc.</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/confluentinc/librdkafka/blob/master/LICENSES.txt</licenseUrl>
+    <projectUrl>https://github.com/confluentinc/librdkafka</projectUrl>
+    <description>The Apache Kafka C/C++ client library - redistributable</description>
+    <summary>The Apache Kafka C/C++ client library</summary>
+    <releaseNotes>Release of librdkafka</releaseNotes>
+    <copyright>Copyright 2012-2023</copyright>
+    <tags>native apache kafka librdkafka C C++ nativepackage</tags>
+  </metadata>
+  <files>
+    <file src="**" />
+  </files>
+</package>
diff --git a/lib/librdkafka-2.4.0/tests/0067-empty_topic.cpp b/lib/librdkafka-2.4.0/tests/0067-empty_topic.cpp
index 2db9ee87350..0000758e8d9 100644
--- a/lib/librdkafka-2.4.0/tests/0067-empty_topic.cpp
+++ b/lib/librdkafka-2.4.0/tests/0067-empty_topic.cpp
@@ -1,148 +1,148 @@
-/*
- * librdkafka - Apache Kafka C library
- *
- * Copyright (c) 2016-2022, Magnus Edenhill
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <iostream>
-#include "testcpp.h"
-
-
-
-/**
- * Issue #1306
- *
- * Consume from an empty topic using Consumer and KafkaConsumer.
- */
-
-
-static void do_test_empty_topic_consumer() {
-  std::string errstr;
-  std::string topic       = Test::mk_topic_name("0067_empty_topic", 1);
-  const int32_t partition = 0;
-
-  RdKafka::Conf *conf;
-
-  Test::conf_init(&conf, NULL, 0);
-
-  Test::conf_set(conf, "enable.partition.eof", "true");
-  Test::conf_set(conf, "allow.auto.create.topics", "true");
-
-  /* Create simple consumer */
-  RdKafka::Consumer *consumer = RdKafka::Consumer::create(conf, errstr);
-  if (!consumer)
-    Test::Fail("Failed to create Consumer: " + errstr);
-
-  RdKafka::Topic *rkt = RdKafka::Topic::create(consumer, topic, NULL, errstr);
-  if (!rkt)
-    Test::Fail("Simple Topic failed: " + errstr);
-
-
-  /* Create the topic through a metadata request. */
-  Test::Say("Creating empty topic " + topic + "\n");
-  RdKafka::Metadata *md;
-  RdKafka::ErrorCode err =
-      consumer->metadata(false, rkt, &md, tmout_multip(10 * 1000));
-  if (err)
-    Test::Fail("Failed to create topic " + topic + ": " +
-               RdKafka::err2str(err));
-  delete md;
-
-  /* Start consumer */
-  err = consumer->start(rkt, partition, RdKafka::Topic::OFFSET_BEGINNING);
-  if (err)
-    Test::Fail("Consume start() failed: " + RdKafka::err2str(err));
-
-  /* Consume using legacy consumer, should give an EOF and nothing else. */
-  Test::Say("Simple Consumer: consuming\n");
-  RdKafka::Message *msg =
-      consumer->consume(rkt, partition, tmout_multip(10 * 1000));
-  if (msg->err() != RdKafka::ERR__PARTITION_EOF)
-    Test::Fail("Simple consume() expected EOF, got " +
-               RdKafka::err2str(msg->err()));
-  delete msg;
-
-  /* Nothing else should come now, just a consume() timeout */
-  msg = consumer->consume(rkt, partition, 1 * 1000);
-  if (msg->err() != RdKafka::ERR__TIMED_OUT)
-    Test::Fail("Simple consume() expected timeout, got " +
-               RdKafka::err2str(msg->err()));
-  delete msg;
-
-  consumer->stop(rkt, partition);
-
-  delete rkt;
-  delete consumer;
-
-
-  /*
-   * Now do the same thing using the high-level KafkaConsumer.
-   */
-
-  Test::conf_set(conf, "group.id", topic);
-
-  Test::conf_set(conf, "enable.partition.eof", "true");
-  Test::conf_set(conf, "allow.auto.create.topics", "true");
-
-  RdKafka::KafkaConsumer *kconsumer =
-      RdKafka::KafkaConsumer::create(conf, errstr);
-  if (!kconsumer)
-    Test::Fail("Failed to create KafkaConsumer: " + errstr);
-
-  std::vector<RdKafka::TopicPartition *> part;
-  part.push_back(RdKafka::TopicPartition::create(topic, partition));
-
-  err = kconsumer->assign(part);
-  if (err)
-    Test::Fail("assign() failed: " + RdKafka::err2str(err));
-
-  RdKafka::TopicPartition::destroy(part);
-
-  Test::Say("KafkaConsumer: consuming\n");
-  msg = kconsumer->consume(tmout_multip(5 * 1000));
-  if (msg->err() != RdKafka::ERR__PARTITION_EOF)
-    Test::Fail("KafkaConsumer consume() expected EOF, got " +
-               RdKafka::err2str(msg->err()));
-  delete msg;
-
-  /* Nothing else should come now, just a consume() timeout */
-  msg = kconsumer->consume(1 * 1000);
-  if (msg->err() != RdKafka::ERR__TIMED_OUT)
-    Test::Fail("KafkaConsumer consume() expected timeout, got " +
-               RdKafka::err2str(msg->err()));
-  delete msg;
-
-  kconsumer->close();
-
-  delete kconsumer;
-  delete conf;
-}
-
-extern "C" {
-int main_0067_empty_topic(int argc, char **argv) {
-  do_test_empty_topic_consumer();
-  return 0;
-}
-}
+/*
+ * librdkafka - Apache Kafka C library
+ *
+ * Copyright (c) 2016-2022, Magnus Edenhill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <iostream>
+#include "testcpp.h"
+
+
+
+/**
+ * Issue #1306
+ *
+ * Consume from an empty topic using Consumer and KafkaConsumer.
+ */
+
+
+static void do_test_empty_topic_consumer() {
+  std::string errstr;
+  std::string topic       = Test::mk_topic_name("0067_empty_topic", 1);
+  const int32_t partition = 0;
+
+  RdKafka::Conf *conf;
+
+  Test::conf_init(&conf, NULL, 0);
+
+  Test::conf_set(conf, "enable.partition.eof", "true");
+  Test::conf_set(conf, "allow.auto.create.topics", "true");
+
+  /* Create simple consumer */
+  RdKafka::Consumer *consumer = RdKafka::Consumer::create(conf, errstr);
+  if (!consumer)
+    Test::Fail("Failed to create Consumer: " + errstr);
+
+  RdKafka::Topic *rkt = RdKafka::Topic::create(consumer, topic, NULL, errstr);
+  if (!rkt)
+    Test::Fail("Simple Topic failed: " + errstr);
+
+
+  /* Create the topic through a metadata request. */
+  Test::Say("Creating empty topic " + topic + "\n");
+  RdKafka::Metadata *md;
+  RdKafka::ErrorCode err =
+      consumer->metadata(false, rkt, &md, tmout_multip(10 * 1000));
+  if (err)
+    Test::Fail("Failed to create topic " + topic + ": " +
+               RdKafka::err2str(err));
+  delete md;
+
+  /* Start consumer */
+  err = consumer->start(rkt, partition, RdKafka::Topic::OFFSET_BEGINNING);
+  if (err)
+    Test::Fail("Consume start() failed: " + RdKafka::err2str(err));
+
+  /* Consume using legacy consumer, should give an EOF and nothing else. */
+  Test::Say("Simple Consumer: consuming\n");
+  RdKafka::Message *msg =
+      consumer->consume(rkt, partition, tmout_multip(10 * 1000));
+  if (msg->err() != RdKafka::ERR__PARTITION_EOF)
+    Test::Fail("Simple consume() expected EOF, got " +
+               RdKafka::err2str(msg->err()));
+  delete msg;
+
+  /* Nothing else should come now, just a consume() timeout */
+  msg = consumer->consume(rkt, partition, 1 * 1000);
+  if (msg->err() != RdKafka::ERR__TIMED_OUT)
+    Test::Fail("Simple consume() expected timeout, got " +
+               RdKafka::err2str(msg->err()));
+  delete msg;
+
+  consumer->stop(rkt, partition);
+
+  delete rkt;
+  delete consumer;
+
+
+  /*
+   * Now do the same thing using the high-level KafkaConsumer.
+   */
+
+  Test::conf_set(conf, "group.id", topic);
+
+  Test::conf_set(conf, "enable.partition.eof", "true");
+  Test::conf_set(conf, "allow.auto.create.topics", "true");
+
+  RdKafka::KafkaConsumer *kconsumer =
+      RdKafka::KafkaConsumer::create(conf, errstr);
+  if (!kconsumer)
+    Test::Fail("Failed to create KafkaConsumer: " + errstr);
+
+  std::vector<RdKafka::TopicPartition *> part;
+  part.push_back(RdKafka::TopicPartition::create(topic, partition));
+
+  err = kconsumer->assign(part);
+  if (err)
+    Test::Fail("assign() failed: " + RdKafka::err2str(err));
+
+  RdKafka::TopicPartition::destroy(part);
+
+  Test::Say("KafkaConsumer: consuming\n");
+  msg = kconsumer->consume(tmout_multip(5 * 1000));
+  if (msg->err() != RdKafka::ERR__PARTITION_EOF)
+    Test::Fail("KafkaConsumer consume() expected EOF, got " +
+               RdKafka::err2str(msg->err()));
+  delete msg;
+
+  /* Nothing else should come now, just a consume() timeout */
+  msg = kconsumer->consume(1 * 1000);
+  if (msg->err() != RdKafka::ERR__TIMED_OUT)
+    Test::Fail("KafkaConsumer consume() expected timeout, got " +
+               RdKafka::err2str(msg->err()));
+  delete msg;
+
+  kconsumer->close();
+
+  delete kconsumer;
+  delete conf;
+}
+
+extern "C" {
+int main_0067_empty_topic(int argc, char **argv) {
+  do_test_empty_topic_consumer();
+  return 0;
+}
+}
diff --git a/lib/librdkafka-2.4.0/win32/librdkafka.vcxproj b/lib/librdkafka-2.4.0/win32/librdkafka.vcxproj
index a7f267e89ed..a321be047d4 100644
--- a/lib/librdkafka-2.4.0/win32/librdkafka.vcxproj
+++ b/lib/librdkafka-2.4.0/win32/librdkafka.vcxproj
@@ -1,260 +1,260 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BEBB59C-477B-4F7A-8AE8-4228D0861E54}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>librdkafka</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)common.vcxproj" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Platform)'=='Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='x64'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg">
-    <VcpkgEnableManifest>true</VcpkgEnableManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>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)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>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)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>/SAFESEH:NO</AdditionalOptions>
-      <AdditionalDependencies>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)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>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)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\cJSON.h" />
-    <ClInclude Include="..\src\crc32c.h" />
-    <ClInclude Include="..\src\queue.h" />
-    <ClInclude Include="..\src\rdatomic.h" />
-    <ClInclude Include="..\src\rdavg.h" />
-    <ClInclude Include="..\src\rdbuf.h" />
-    <ClInclude Include="..\src\rdbase64.h" />
-    <ClInclude Include="..\src\rdendian.h" />
-    <ClInclude Include="..\src\rdfloat.h" />
-    <ClInclude Include="..\src\rdgz.h" />
-    <ClInclude Include="..\src\rdinterval.h" />
-    <ClInclude Include="..\src\rdkafka_admin.h" />
-    <ClInclude Include="..\src\rdkafka_assignor.h" />
-    <ClInclude Include="..\src\rdkafka_buf.h" />
-    <ClInclude Include="..\src\rdkafka_cgrp.h" />
-    <ClInclude Include="..\src\rdkafka_conf.h" />
-    <ClInclude Include="..\src\rdkafka_confval.h" />
-    <ClInclude Include="..\src\rdkafka_event.h" />
-    <ClInclude Include="..\src\rdkafka_feature.h" />
-    <ClInclude Include="..\src\rdhttp.h" />
-    <ClInclude Include="..\src\rdkafka_lz4.h" />
-    <ClInclude Include="..\src\rdkafka_mock.h" />
-    <ClInclude Include="..\src\rdkafka_mock_int.h" />
-    <ClInclude Include="..\src\rdkafka_error.h" />
-    <ClInclude Include="..\src\rdkafka_msgset.h" />
-    <ClInclude Include="..\src\rdkafka_op.h" />
-    <ClInclude Include="..\src\rdkafka_partition.h" />
-    <ClInclude Include="..\src\rdkafka_pattern.h" />
-    <ClInclude Include="..\src\rdkafka_queue.h" />
-    <ClInclude Include="..\src\rdkafka_request.h" />
-    <ClInclude Include="..\src\rdkafka_sasl.h" />
-    <ClInclude Include="..\src\rdkafka_sasl_int.h" />
-    <ClInclude Include="..\src\rdkafka_sasl_oauthbearer_oidc.h" />
-    <ClInclude Include="..\src\rdkafka_transport_int.h" />
-    <ClInclude Include="..\src\rdlist.h" />
-    <ClInclude Include="..\src\rdposix.h" />
-    <ClInclude Include="..\src\rd.h" />
-    <ClInclude Include="..\src\rdaddr.h" />
-    <ClInclude Include="..\src\rdcrc32.h" />
-    <ClInclude Include="..\src\rdkafka.h" />
-    <ClInclude Include="..\src\rdkafka_broker.h" />
-    <ClInclude Include="..\src\rdkafka_int.h" />
-    <ClInclude Include="..\src\rdkafka_msg.h" />
-    <ClInclude Include="..\src\rdkafka_offset.h" />
-    <ClInclude Include="..\src\rdkafka_proto.h" />
-    <ClInclude Include="..\src\rdkafka_timer.h" />
-    <ClInclude Include="..\src\rdkafka_topic.h" />
-    <ClInclude Include="..\src\rdkafka_transport.h" />
-    <ClInclude Include="..\src\rdkafka_ssl.h" />
-    <ClInclude Include="..\src\rdkafka_cert.h" />
-    <ClInclude Include="..\src\rdkafka_metadata.h" />
-    <ClInclude Include="..\src\rdkafka_interceptor.h" />
-    <ClInclude Include="..\src\rdkafka_plugin.h" />
-    <ClInclude Include="..\src\rdkafka_header.h" />
-    <ClInclude Include="..\src\rdlog.h" />
-    <ClInclude Include="..\src\rdstring.h" />
-    <ClInclude Include="..\src\rdrand.h" />
-    <ClInclude Include="..\src\rdsysqueue.h" />
-    <ClInclude Include="..\src\rdtime.h" />
-    <ClInclude Include="..\src\rdtypes.h" />
-    <ClInclude Include="..\src\rdregex.h" />
-    <ClInclude Include="..\src\rdunittest.h" />
-    <ClInclude Include="..\src\rdvarint.h" />
-    <ClInclude Include="..\src\snappy.h" />
-    <ClInclude Include="..\src\snappy_compat.h" />
-    <ClInclude Include="..\src\tinycthread.h" />
-    <ClInclude Include="..\src\tinycthread_extra.h" />
-    <ClInclude Include="..\src\rdwin32.h" />
-    <ClInclude Include="..\src\win32_config.h" />
-    <ClInclude Include="..\src\regexp.h" />
-    <ClInclude Include="..\src\rdavl.h" />
-    <ClInclude Include="..\src\rdports.h" />
-    <ClInclude Include="..\src\rddl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\cJSON.c" />
-    <ClCompile Include="..\src\crc32c.c" />
-    <ClCompile Include="..\src\rdaddr.c" />
-    <ClCompile Include="..\src\rdbuf.c" />
-    <ClCompile Include="..\src\rdbase64.c" />
-    <ClCompile Include="..\src\rdcrc32.c" />
-    <ClCompile Include="..\src\rdfnv1a.c" />
-    <ClCompile Include="..\src\rdgz.c" />
-    <ClCompile Include="..\src\rdhdrhistogram.c" />
-    <ClCompile Include="..\src\rdkafka.c" />
-    <ClCompile Include="..\src\rdkafka_assignor.c" />
-    <ClCompile Include="..\src\rdkafka_broker.c" />
-    <ClCompile Include="..\src\rdkafka_cgrp.c" />
-    <ClCompile Include="..\src\rdkafka_conf.c" />
-    <ClCompile Include="..\src\rdkafka_event.c" />
-    <ClCompile Include="..\src\rdhttp.c" />
-    <ClCompile Include="..\src\rdkafka_lz4.c" />
-    <ClCompile Include="..\src\rdkafka_msg.c" />
-    <ClCompile Include="..\src\rdkafka_msgset_reader.c" />
-    <ClCompile Include="..\src\rdkafka_msgset_writer.c" />
-    <ClCompile Include="..\src\rdkafka_offset.c" />
-    <ClCompile Include="..\src\rdkafka_op.c" />
-    <ClCompile Include="..\src\rdkafka_partition.c" />
-    <ClCompile Include="..\src\rdkafka_pattern.c" />
-    <ClCompile Include="..\src\rdkafka_queue.c" />
-    <ClCompile Include="..\src\rdkafka_range_assignor.c" />
-    <ClCompile Include="..\src\rdkafka_roundrobin_assignor.c" />
-    <ClCompile Include="..\src\rdkafka_sticky_assignor.c" />
-    <ClCompile Include="..\src\rdkafka_request.c" />
-    <ClCompile Include="..\src\rdkafka_sasl.c" />
-    <ClCompile Include="..\src\rdkafka_sasl_win32.c" />
-    <ClCompile Include="..\src\rdkafka_sasl_plain.c" />
-    <ClCompile Include="..\src\rdkafka_sasl_scram.c" />
-    <ClCompile Include="..\src\rdkafka_sasl_oauthbearer.c" />
-    <ClCompile Include="..\src\rdkafka_sasl_oauthbearer_oidc.c" />
-    <ClCompile Include="..\src\rdkafka_subscription.c" />
-    <ClCompile Include="..\src\rdkafka_assignment.c" />
-    <ClCompile Include="..\src\rdkafka_timer.c" />
-    <ClCompile Include="..\src\rdkafka_topic.c" />
-    <ClCompile Include="..\src\rdkafka_transport.c" />
-    <ClCompile Include="..\src\rdkafka_ssl.c" />
-    <ClCompile Include="..\src\rdkafka_cert.c" />
-    <ClCompile Include="..\src\rdkafka_buf.c" />
-    <ClCompile Include="..\src\rdkafka_feature.c" />
-    <ClCompile Include="..\src\rdkafka_metadata.c" />
-    <ClCompile Include="..\src\rdkafka_metadata_cache.c" />
-    <ClCompile Include="..\src\rdkafka_interceptor.c" />
-    <ClCompile Include="..\src\rdkafka_plugin.c" />
-    <ClCompile Include="..\src\rdkafka_header.c" />
-    <ClCompile Include="..\src\rdkafka_admin.c" />
-    <ClCompile Include="..\src\rdkafka_aux.c" />
-    <ClCompile Include="..\src\rdkafka_background.c" />
-    <ClCompile Include="..\src\rdkafka_idempotence.c" />
-    <ClCompile Include="..\src\rdkafka_txnmgr.c" />
-    <ClCompile Include="..\src\rdkafka_coord.c" />
-    <ClCompile Include="..\src\rdkafka_zstd.c" />
-    <ClCompile Include="..\src\rdkafka_mock.c" />
-    <ClCompile Include="..\src\rdkafka_mock_handlers.c" />
-    <ClCompile Include="..\src\rdkafka_mock_cgrp.c" />
-    <ClCompile Include="..\src\rdkafka_error.c" />
-    <ClCompile Include="..\src\rdkafka_fetcher.c" />
-    <ClCompile Include="..\src\rdlist.c" />
-    <ClCompile Include="..\src\rdlog.c" />
-    <ClCompile Include="..\src\rdmurmur2.c" />
-    <ClCompile Include="..\src\rdstring.c" />
-    <ClCompile Include="..\src\rdrand.c" />
-    <ClCompile Include="..\src\rdregex.c" />
-    <ClCompile Include="..\src\rdunittest.c" />
-    <ClCompile Include="..\src\rdvarint.c" />
-    <ClCompile Include="..\src\rdmap.c" />
-    <ClCompile Include="..\src\snappy.c" />
-    <ClCompile Include="..\src\tinycthread.c" />
-    <ClCompile Include="..\src\tinycthread_extra.c" />
-    <ClCompile Include="..\src\regexp.c" />
-    <ClCompile Include="..\src\rdports.c" />
-    <ClCompile Include="..\src\rdavl.c" />
-    <ClCompile Include="..\src\rdxxhash.c" />
-    <ClCompile Include="..\src\lz4.c" />
-    <ClCompile Include="..\src\lz4frame.c" />
-    <ClCompile Include="..\src\lz4hc.c" />
-    <ClCompile Include="..\src\rddl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\README.win32" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4BEBB59C-477B-4F7A-8AE8-4228D0861E54}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>librdkafka</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)common.vcxproj" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Platform)'=='Win32'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalOptions>/SAFESEH:NO</AdditionalOptions>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\cJSON.h" />
+    <ClInclude Include="..\src\crc32c.h" />
+    <ClInclude Include="..\src\queue.h" />
+    <ClInclude Include="..\src\rdatomic.h" />
+    <ClInclude Include="..\src\rdavg.h" />
+    <ClInclude Include="..\src\rdbuf.h" />
+    <ClInclude Include="..\src\rdbase64.h" />
+    <ClInclude Include="..\src\rdendian.h" />
+    <ClInclude Include="..\src\rdfloat.h" />
+    <ClInclude Include="..\src\rdgz.h" />
+    <ClInclude Include="..\src\rdinterval.h" />
+    <ClInclude Include="..\src\rdkafka_admin.h" />
+    <ClInclude Include="..\src\rdkafka_assignor.h" />
+    <ClInclude Include="..\src\rdkafka_buf.h" />
+    <ClInclude Include="..\src\rdkafka_cgrp.h" />
+    <ClInclude Include="..\src\rdkafka_conf.h" />
+    <ClInclude Include="..\src\rdkafka_confval.h" />
+    <ClInclude Include="..\src\rdkafka_event.h" />
+    <ClInclude Include="..\src\rdkafka_feature.h" />
+    <ClInclude Include="..\src\rdhttp.h" />
+    <ClInclude Include="..\src\rdkafka_lz4.h" />
+    <ClInclude Include="..\src\rdkafka_mock.h" />
+    <ClInclude Include="..\src\rdkafka_mock_int.h" />
+    <ClInclude Include="..\src\rdkafka_error.h" />
+    <ClInclude Include="..\src\rdkafka_msgset.h" />
+    <ClInclude Include="..\src\rdkafka_op.h" />
+    <ClInclude Include="..\src\rdkafka_partition.h" />
+    <ClInclude Include="..\src\rdkafka_pattern.h" />
+    <ClInclude Include="..\src\rdkafka_queue.h" />
+    <ClInclude Include="..\src\rdkafka_request.h" />
+    <ClInclude Include="..\src\rdkafka_sasl.h" />
+    <ClInclude Include="..\src\rdkafka_sasl_int.h" />
+    <ClInclude Include="..\src\rdkafka_sasl_oauthbearer_oidc.h" />
+    <ClInclude Include="..\src\rdkafka_transport_int.h" />
+    <ClInclude Include="..\src\rdlist.h" />
+    <ClInclude Include="..\src\rdposix.h" />
+    <ClInclude Include="..\src\rd.h" />
+    <ClInclude Include="..\src\rdaddr.h" />
+    <ClInclude Include="..\src\rdcrc32.h" />
+    <ClInclude Include="..\src\rdkafka.h" />
+    <ClInclude Include="..\src\rdkafka_broker.h" />
+    <ClInclude Include="..\src\rdkafka_int.h" />
+    <ClInclude Include="..\src\rdkafka_msg.h" />
+    <ClInclude Include="..\src\rdkafka_offset.h" />
+    <ClInclude Include="..\src\rdkafka_proto.h" />
+    <ClInclude Include="..\src\rdkafka_timer.h" />
+    <ClInclude Include="..\src\rdkafka_topic.h" />
+    <ClInclude Include="..\src\rdkafka_transport.h" />
+    <ClInclude Include="..\src\rdkafka_ssl.h" />
+    <ClInclude Include="..\src\rdkafka_cert.h" />
+    <ClInclude Include="..\src\rdkafka_metadata.h" />
+    <ClInclude Include="..\src\rdkafka_interceptor.h" />
+    <ClInclude Include="..\src\rdkafka_plugin.h" />
+    <ClInclude Include="..\src\rdkafka_header.h" />
+    <ClInclude Include="..\src\rdlog.h" />
+    <ClInclude Include="..\src\rdstring.h" />
+    <ClInclude Include="..\src\rdrand.h" />
+    <ClInclude Include="..\src\rdsysqueue.h" />
+    <ClInclude Include="..\src\rdtime.h" />
+    <ClInclude Include="..\src\rdtypes.h" />
+    <ClInclude Include="..\src\rdregex.h" />
+    <ClInclude Include="..\src\rdunittest.h" />
+    <ClInclude Include="..\src\rdvarint.h" />
+    <ClInclude Include="..\src\snappy.h" />
+    <ClInclude Include="..\src\snappy_compat.h" />
+    <ClInclude Include="..\src\tinycthread.h" />
+    <ClInclude Include="..\src\tinycthread_extra.h" />
+    <ClInclude Include="..\src\rdwin32.h" />
+    <ClInclude Include="..\src\win32_config.h" />
+    <ClInclude Include="..\src\regexp.h" />
+    <ClInclude Include="..\src\rdavl.h" />
+    <ClInclude Include="..\src\rdports.h" />
+    <ClInclude Include="..\src\rddl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\cJSON.c" />
+    <ClCompile Include="..\src\crc32c.c" />
+    <ClCompile Include="..\src\rdaddr.c" />
+    <ClCompile Include="..\src\rdbuf.c" />
+    <ClCompile Include="..\src\rdbase64.c" />
+    <ClCompile Include="..\src\rdcrc32.c" />
+    <ClCompile Include="..\src\rdfnv1a.c" />
+    <ClCompile Include="..\src\rdgz.c" />
+    <ClCompile Include="..\src\rdhdrhistogram.c" />
+    <ClCompile Include="..\src\rdkafka.c" />
+    <ClCompile Include="..\src\rdkafka_assignor.c" />
+    <ClCompile Include="..\src\rdkafka_broker.c" />
+    <ClCompile Include="..\src\rdkafka_cgrp.c" />
+    <ClCompile Include="..\src\rdkafka_conf.c" />
+    <ClCompile Include="..\src\rdkafka_event.c" />
+    <ClCompile Include="..\src\rdhttp.c" />
+    <ClCompile Include="..\src\rdkafka_lz4.c" />
+    <ClCompile Include="..\src\rdkafka_msg.c" />
+    <ClCompile Include="..\src\rdkafka_msgset_reader.c" />
+    <ClCompile Include="..\src\rdkafka_msgset_writer.c" />
+    <ClCompile Include="..\src\rdkafka_offset.c" />
+    <ClCompile Include="..\src\rdkafka_op.c" />
+    <ClCompile Include="..\src\rdkafka_partition.c" />
+    <ClCompile Include="..\src\rdkafka_pattern.c" />
+    <ClCompile Include="..\src\rdkafka_queue.c" />
+    <ClCompile Include="..\src\rdkafka_range_assignor.c" />
+    <ClCompile Include="..\src\rdkafka_roundrobin_assignor.c" />
+    <ClCompile Include="..\src\rdkafka_sticky_assignor.c" />
+    <ClCompile Include="..\src\rdkafka_request.c" />
+    <ClCompile Include="..\src\rdkafka_sasl.c" />
+    <ClCompile Include="..\src\rdkafka_sasl_win32.c" />
+    <ClCompile Include="..\src\rdkafka_sasl_plain.c" />
+    <ClCompile Include="..\src\rdkafka_sasl_scram.c" />
+    <ClCompile Include="..\src\rdkafka_sasl_oauthbearer.c" />
+    <ClCompile Include="..\src\rdkafka_sasl_oauthbearer_oidc.c" />
+    <ClCompile Include="..\src\rdkafka_subscription.c" />
+    <ClCompile Include="..\src\rdkafka_assignment.c" />
+    <ClCompile Include="..\src\rdkafka_timer.c" />
+    <ClCompile Include="..\src\rdkafka_topic.c" />
+    <ClCompile Include="..\src\rdkafka_transport.c" />
+    <ClCompile Include="..\src\rdkafka_ssl.c" />
+    <ClCompile Include="..\src\rdkafka_cert.c" />
+    <ClCompile Include="..\src\rdkafka_buf.c" />
+    <ClCompile Include="..\src\rdkafka_feature.c" />
+    <ClCompile Include="..\src\rdkafka_metadata.c" />
+    <ClCompile Include="..\src\rdkafka_metadata_cache.c" />
+    <ClCompile Include="..\src\rdkafka_interceptor.c" />
+    <ClCompile Include="..\src\rdkafka_plugin.c" />
+    <ClCompile Include="..\src\rdkafka_header.c" />
+    <ClCompile Include="..\src\rdkafka_admin.c" />
+    <ClCompile Include="..\src\rdkafka_aux.c" />
+    <ClCompile Include="..\src\rdkafka_background.c" />
+    <ClCompile Include="..\src\rdkafka_idempotence.c" />
+    <ClCompile Include="..\src\rdkafka_txnmgr.c" />
+    <ClCompile Include="..\src\rdkafka_coord.c" />
+    <ClCompile Include="..\src\rdkafka_zstd.c" />
+    <ClCompile Include="..\src\rdkafka_mock.c" />
+    <ClCompile Include="..\src\rdkafka_mock_handlers.c" />
+    <ClCompile Include="..\src\rdkafka_mock_cgrp.c" />
+    <ClCompile Include="..\src\rdkafka_error.c" />
+    <ClCompile Include="..\src\rdkafka_fetcher.c" />
+    <ClCompile Include="..\src\rdlist.c" />
+    <ClCompile Include="..\src\rdlog.c" />
+    <ClCompile Include="..\src\rdmurmur2.c" />
+    <ClCompile Include="..\src\rdstring.c" />
+    <ClCompile Include="..\src\rdrand.c" />
+    <ClCompile Include="..\src\rdregex.c" />
+    <ClCompile Include="..\src\rdunittest.c" />
+    <ClCompile Include="..\src\rdvarint.c" />
+    <ClCompile Include="..\src\rdmap.c" />
+    <ClCompile Include="..\src\snappy.c" />
+    <ClCompile Include="..\src\tinycthread.c" />
+    <ClCompile Include="..\src\tinycthread_extra.c" />
+    <ClCompile Include="..\src\regexp.c" />
+    <ClCompile Include="..\src\rdports.c" />
+    <ClCompile Include="..\src\rdavl.c" />
+    <ClCompile Include="..\src\rdxxhash.c" />
+    <ClCompile Include="..\src\lz4.c" />
+    <ClCompile Include="..\src\lz4frame.c" />
+    <ClCompile Include="..\src\lz4hc.c" />
+    <ClCompile Include="..\src\rddl.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\README.win32" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/lib/librdkafka-2.4.0/win32/librdkafkacpp/librdkafkacpp.vcxproj b/lib/librdkafka-2.4.0/win32/librdkafkacpp/librdkafkacpp.vcxproj
index ffce70182ce..915372f5789 100644
--- a/lib/librdkafka-2.4.0/win32/librdkafkacpp/librdkafkacpp.vcxproj
+++ b/lib/librdkafka-2.4.0/win32/librdkafkacpp/librdkafkacpp.vcxproj
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E9641737-EE62-4EC8-88C8-792D2E3CE32D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>librdkafkacpp</RootNamespace>
-    <ProjectName>librdkafkacpp</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)common.vcxproj"/>
-  <PropertyGroup Label="UserMacros" />
-
-  <ItemDefinitionGroup>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-     <AdditionalDependencies>librdkafka.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)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(BuildOutputDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src-cpp\ConfImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\ConsumerImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\HandleImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\KafkaConsumerImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\HeadersImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\MessageImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\MetadataImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\ProducerImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\QueueImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\RdKafka.cpp" />
-    <ClCompile Include="..\..\src-cpp\TopicImpl.cpp" />
-    <ClCompile Include="..\..\src-cpp\TopicPartitionImpl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src-cpp\rdkafkacpp.h" />
-    <ClInclude Include="..\..\src-cpp\rdkafkacpp_int.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E9641737-EE62-4EC8-88C8-792D2E3CE32D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>librdkafkacpp</RootNamespace>
+    <ProjectName>librdkafkacpp</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)common.vcxproj"/>
+  <PropertyGroup Label="UserMacros" />
+
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+     <AdditionalDependencies>librdkafka.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)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(BuildOutputDir)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBRDKAFKACPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src-cpp\ConfImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\ConsumerImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\HandleImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\KafkaConsumerImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\HeadersImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\MessageImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\MetadataImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\ProducerImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\QueueImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\RdKafka.cpp" />
+    <ClCompile Include="..\..\src-cpp\TopicImpl.cpp" />
+    <ClCompile Include="..\..\src-cpp\TopicPartitionImpl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src-cpp\rdkafkacpp.h" />
+    <ClInclude Include="..\..\src-cpp\rdkafkacpp_int.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/lib/librdkafka-2.4.0/win32/rdkafka_example/rdkafka_example.vcxproj b/lib/librdkafka-2.4.0/win32/rdkafka_example/rdkafka_example.vcxproj
index a5e35c5c08e..4e27138cade 100644
--- a/lib/librdkafka-2.4.0/win32/rdkafka_example/rdkafka_example.vcxproj
+++ b/lib/librdkafka-2.4.0/win32/rdkafka_example/rdkafka_example.vcxproj
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{84585784-5BDC-43BE-B714-23EA2E7AEA5B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rdkafka_example</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)common.vcxproj"/>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>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;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(BuildOutputDir)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\rdkafka_example.cpp" />
-    <ClCompile Include="..\wingetopt.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\wingetopt.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{84585784-5BDC-43BE-B714-23EA2E7AEA5B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>rdkafka_example</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)common.vcxproj"/>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>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;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(BuildOutputDir)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../src-cpp</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\examples\rdkafka_example.cpp" />
+    <ClCompile Include="..\wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/lib/luajit-04dca791/src/msvcbuild.bat b/lib/luajit-04dca791/src/msvcbuild.bat
index 13b8175ad15..95fb7954569 100644
--- a/lib/luajit-04dca791/src/msvcbuild.bat
+++ b/lib/luajit-04dca791/src/msvcbuild.bat
@@ -1,155 +1,155 @@
-@rem Script to build LuaJIT with MSVC.
-@rem Copyright (C) 2005-2023 Mike Pall. See Copyright Notice in luajit.h
-@rem
-@rem Open a "Visual Studio Command Prompt" (either x86 or x64).
-@rem Then cd to this directory and run this script. Use the following
-@rem options (in order), if needed. The default is a dynamic release build.
-@rem
-@rem   nogc64   disable LJ_GC64 mode for x64
-@rem   debug    emit debug symbols
-@rem   amalg    amalgamated build
-@rem   static   static linkage
-
-@if not defined INCLUDE goto :FAIL
-
-@setlocal
-@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
-@set DEBUGCFLAGS=
-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
-@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
-@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd 
-@set LJCOMPILETARGET=/Zi
-@set LJLINKTYPE=/DEBUG /RELEASE
-@set LJLINKTYPE_DEBUG=/DEBUG
-@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set LJLIB=lib /nologo /nodefaultlib
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set DASC=vm_x64.dasc
-@set LJDLLNAME=lua51.dll
-@set LJLIBNAME=lua51.lib
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-@setlocal
-@call :SETHOSTVARS
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-@endlocal
-
-@set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU -D P64
-@set LJARCH=x64
-@minilua
-@if errorlevel 8 goto :NO32
-@set DASC=vm_x86.dasc
-@set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU
-@set LJARCH=x86
-@set LJCOMPILE=%LJCOMPILE% /arch:SSE2
-@goto :DA
-:NO32
-@if "%VSCMD_ARG_TGT_ARCH%" neq "arm64" goto :X64
-@set DASC=vm_arm64.dasc
-@set DASMTARGET=-D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
-@set LJARCH=arm64
-@goto :DA
-:X64
-@if "%1" neq "nogc64" goto :DA
-@shift
-@set DASC=vm_x86.dasc
-@set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
-:DA
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-@setlocal
-@call :SETHOSTVARS
-%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-@endlocal
-
-buildvm -m peobj -o lj_vm.obj
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%
-@set LJDYNBUILD=%LJDYNBUILD_DEBUG%
-@set LJLINKTYPE=%LJLINKTYPE_DEBUG%
-:NODEBUG
-@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
-@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
-@if "%1"=="amalg" goto :AMALGDLL
-@if "%1"=="static" goto :STATIC
-%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
-@if errorlevel 1 goto :BAD
-@goto :MTDLL
-:STATIC
-%LJCOMPILE% lj_*.c lib_*.c
-@if errorlevel 1 goto :BAD
-%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
-@if errorlevel 1 goto :BAD
-@goto :MTDLL
-:AMALGDLL
-%LJCOMPILE% %LJDYNBUILD% ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
-@if errorlevel 1 goto :BAD
-:MTDLL
-if exist %LJDLLNAME%.manifest^
-  %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
-
-%LJCOMPILE% luajit.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
-@if errorlevel 1 goto :BAD
-if exist luajit.exe.manifest^
-  %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
-
-@del *.obj *.manifest minilua.exe buildvm.exe
-@del host\buildvm_arch.h
-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
-@echo.
-@echo === Successfully built LuaJIT for Windows/%LJARCH% ===
-
-@goto :END
-:SETHOSTVARS
-@if "%VSCMD_ARG_HOST_ARCH%_%VSCMD_ARG_TGT_ARCH%" equ "x64_arm64" (
-  call "%VSINSTALLDIR%Common7\Tools\VsDevCmd.bat" -arch=%VSCMD_ARG_HOST_ARCH% -no_logo
-  echo on
-)
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo You must open a "Visual Studio Command Prompt" to run this script
-:END
+@rem Script to build LuaJIT with MSVC.
+@rem Copyright (C) 2005-2023 Mike Pall. See Copyright Notice in luajit.h
+@rem
+@rem Open a "Visual Studio Command Prompt" (either x86 or x64).
+@rem Then cd to this directory and run this script. Use the following
+@rem options (in order), if needed. The default is a dynamic release build.
+@rem
+@rem   nogc64   disable LJ_GC64 mode for x64
+@rem   debug    emit debug symbols
+@rem   amalg    amalgamated build
+@rem   static   static linkage
+
+@if not defined INCLUDE goto :FAIL
+
+@setlocal
+@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
+@set DEBUGCFLAGS=
+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
+@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd 
+@set LJCOMPILETARGET=/Zi
+@set LJLINKTYPE=/DEBUG /RELEASE
+@set LJLINKTYPE_DEBUG=/DEBUG
+@set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set LJLIB=lib /nologo /nodefaultlib
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set DASC=vm_x64.dasc
+@set LJDLLNAME=lua51.dll
+@set LJLIBNAME=lua51.lib
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+@setlocal
+@call :SETHOSTVARS
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+@endlocal
+
+@set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU -D P64
+@set LJARCH=x64
+@minilua
+@if errorlevel 8 goto :NO32
+@set DASC=vm_x86.dasc
+@set DASMFLAGS=-D WIN -D JIT -D FFI -D ENDIAN_LE -D FPU
+@set LJARCH=x86
+@set LJCOMPILE=%LJCOMPILE% /arch:SSE2
+@goto :DA
+:NO32
+@if "%VSCMD_ARG_TGT_ARCH%" neq "arm64" goto :X64
+@set DASC=vm_arm64.dasc
+@set DASMTARGET=-D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
+@set LJARCH=arm64
+@goto :DA
+:X64
+@if "%1" neq "nogc64" goto :DA
+@shift
+@set DASC=vm_x86.dasc
+@set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64
+:DA
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+@setlocal
+@call :SETHOSTVARS
+%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+@endlocal
+
+buildvm -m peobj -o lj_vm.obj
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% %DEBUGCFLAGS%
+@set LJDYNBUILD=%LJDYNBUILD_DEBUG%
+@set LJLINKTYPE=%LJLINKTYPE_DEBUG%
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% %LJCOMPILETARGET%
+@set LJLINK=%LJLINK% %LJLINKTYPE% %LJLINKTARGET%
+@if "%1"=="amalg" goto :AMALGDLL
+@if "%1"=="static" goto :STATIC
+%LJCOMPILE% %LJDYNBUILD% lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :MTDLL
+:STATIC
+%LJCOMPILE% lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :MTDLL
+:AMALGDLL
+%LJCOMPILE% %LJDYNBUILD% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
+@if errorlevel 1 goto :BAD
+:MTDLL
+if exist %LJDLLNAME%.manifest^
+  %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
+
+%LJCOMPILE% luajit.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
+@if errorlevel 1 goto :BAD
+if exist luajit.exe.manifest^
+  %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
+
+@del *.obj *.manifest minilua.exe buildvm.exe
+@del host\buildvm_arch.h
+@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
+@echo.
+@echo === Successfully built LuaJIT for Windows/%LJARCH% ===
+
+@goto :END
+:SETHOSTVARS
+@if "%VSCMD_ARG_HOST_ARCH%_%VSCMD_ARG_TGT_ARCH%" equ "x64_arm64" (
+  call "%VSINSTALLDIR%Common7\Tools\VsDevCmd.bat" -arch=%VSCMD_ARG_HOST_ARCH% -no_logo
+  echo on
+)
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo You must open a "Visual Studio Command Prompt" to run this script
+:END
diff --git a/lib/luajit-04dca791/src/nxbuild.bat b/lib/luajit-04dca791/src/nxbuild.bat
index 9151339773e..861ecdec62f 100644
--- a/lib/luajit-04dca791/src/nxbuild.bat
+++ b/lib/luajit-04dca791/src/nxbuild.bat
@@ -1,165 +1,165 @@
-@rem Script to build LuaJIT with NintendoSDK + NX Addon.
-@rem Donated to the public domain by Swyter.
-@rem
-@rem To run this script you must open a "Native Tools Command Prompt for VS".
-@rem
-@rem Either the x86 version for NX32, or x64 for the NX64 target.
-@rem This is because the pointer size of the LuaJIT host tools (buildvm.exe)
-@rem must match the cross-compiled target (32 or 64 bits).
-@rem
-@rem Then cd to this directory and run this script.
-@rem
-@rem Recommended invocation:
-@rem
-@rem nxbuild            # release build, amalgamated
-@rem nxbuild debug      # debug build, amalgamated
-@rem
-@rem Additional command-line options (not generally recommended):
-@rem
-@rem noamalg            # (after debug) non-amalgamated build
-
-@if not defined INCLUDE goto :FAIL
-@if not defined NINTENDO_SDK_ROOT goto :FAIL
-@if not defined PLATFORM goto :FAIL
-
-@if "%platform%" == "x86" goto :DO_NX32
-@if "%platform%" == "x64" goto :DO_NX64
-
-@echo Error: Current host platform is %platform%!
-@echo.
-@goto :FAIL
-
-@setlocal
-
-:DO_NX32
-@set DASC=vm_arm.dasc
-@set DASMFLAGS= -D HFABI -D FPU
-@set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM
-@set HOST_PTR_SIZE=4
-goto :BEGIN
-
-:DO_NX64
-@set DASC=vm_arm64.dasc
-@set DASMFLAGS= -D ENDIAN_LE
-@set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
-@set HOST_PTR_SIZE=8
-
-:BEGIN
-@rem ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /wo4146 /wo4244 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Check that we have the right 32/64 bit host compiler to generate the right virtual machine files.
-@minilua
-@if "%ERRORLEVEL%" == "%HOST_PTR_SIZE%" goto :PASSED_PTR_CHECK
-
-@echo The pointer size of the host in bytes (%HOST_PTR_SIZE%) does not match the expected value (%errorlevel%).
-@echo Check that the script is being ran under the correct x86/x64 VS prompt.
-@goto :BAD
-
-:PASSED_PTR_CHECK
-@set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@rem ---- Cross compiler ----
-@set NXCOMPILER_ROOT="%NINTENDO_SDK_ROOT%\Compilers\NintendoClang"
-@if "%platform%" neq "x64" goto :NX32_CROSSBUILD
-@set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=aarch64-nintendo-nx-elf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c
-@set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
-@set TARGETLIB_SUFFIX=nx64
-
-%NXCOMPILER_ROOT%\bin\clang --target=aarch64-nintendo-nx-elf -o lj_vm.o -c lj_vm.s
-goto :DEBUGCHECK
-
-:NX32_CROSSBUILD
-@set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=armv7l-nintendo-nx-eabihf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c
-@set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
-@set TARGETLIB_SUFFIX=nx32
-
-%NXCOMPILER_ROOT%\bin\clang --target=armv7l-nintendo-nx-eabihf -o lj_vm.o -c lj_vm.s
-:DEBUGCHECK
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_DEBUG -g -O0
-@set TARGETLIB=libluajitD_%TARGETLIB_SUFFIX%.a
-goto :BUILD
-:NODEBUG
-@set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_RELEASE -O3
-@set TARGETLIB=libluajit_%TARGETLIB_SUFFIX%.a
-:BUILD
-del %TARGETLIB%
-@set LJCOMPILE=%LJCOMPILE% -fPIC
-@if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
-  %LJCOMPILE% %%f
-  @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
-@if errorlevel 1 goto :BAD
-@goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
-@if errorlevel 1 goto :BAD
-:NOAMALG
-
-@del *.o *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for Nintendo Switch (%TARGETLIB_SUFFIX%) ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Native Tools Command Prompt for VS".
-@echo.
-@echo Either the x86 version for NX32, or x64 for the NX64 target.
-@echo This is because the pointer size of the LuaJIT host tools (buildvm.exe)
-@echo must match the cross-compiled target (32 or 64 bits).
-@echo.
-@echo Keep in mind that NintendoSDK + NX Addon must be installed, too.
-:END
+@rem Script to build LuaJIT with NintendoSDK + NX Addon.
+@rem Donated to the public domain by Swyter.
+@rem
+@rem To run this script you must open a "Native Tools Command Prompt for VS".
+@rem
+@rem Either the x86 version for NX32, or x64 for the NX64 target.
+@rem This is because the pointer size of the LuaJIT host tools (buildvm.exe)
+@rem must match the cross-compiled target (32 or 64 bits).
+@rem
+@rem Then cd to this directory and run this script.
+@rem
+@rem Recommended invocation:
+@rem
+@rem nxbuild            # release build, amalgamated
+@rem nxbuild debug      # debug build, amalgamated
+@rem
+@rem Additional command-line options (not generally recommended):
+@rem
+@rem noamalg            # (after debug) non-amalgamated build
+
+@if not defined INCLUDE goto :FAIL
+@if not defined NINTENDO_SDK_ROOT goto :FAIL
+@if not defined PLATFORM goto :FAIL
+
+@if "%platform%" == "x86" goto :DO_NX32
+@if "%platform%" == "x64" goto :DO_NX64
+
+@echo Error: Current host platform is %platform%!
+@echo.
+@goto :FAIL
+
+@setlocal
+
+:DO_NX32
+@set DASC=vm_arm.dasc
+@set DASMFLAGS= -D HFABI -D FPU
+@set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM
+@set HOST_PTR_SIZE=4
+goto :BEGIN
+
+:DO_NX64
+@set DASC=vm_arm64.dasc
+@set DASMFLAGS= -D ENDIAN_LE
+@set DASMTARGET= -D LUAJIT_TARGET=LUAJIT_ARCH_ARM64
+@set HOST_PTR_SIZE=8
+
+:BEGIN
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /wo4146 /wo4244 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Check that we have the right 32/64 bit host compiler to generate the right virtual machine files.
+@minilua
+@if "%ERRORLEVEL%" == "%HOST_PTR_SIZE%" goto :PASSED_PTR_CHECK
+
+@echo The pointer size of the host in bytes (%HOST_PTR_SIZE%) does not match the expected value (%errorlevel%).
+@echo Check that the script is being ran under the correct x86/x64 VS prompt.
+@goto :BAD
+
+:PASSED_PTR_CHECK
+@set DASMFLAGS=%DASMFLAGS% %DASMTARGET% -D LJ_TARGET_NX -D LUAJIT_OS=LUAJIT_OS_OTHER -D LUAJIT_DISABLE_JIT -D LUAJIT_DISABLE_FFI
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %DASMTARGET% -D LJ_TARGET_NX -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set NXCOMPILER_ROOT="%NINTENDO_SDK_ROOT%\Compilers\NintendoClang"
+@if "%platform%" neq "x64" goto :NX32_CROSSBUILD
+@set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=aarch64-nintendo-nx-elf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c
+@set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
+@set TARGETLIB_SUFFIX=nx64
+
+%NXCOMPILER_ROOT%\bin\clang --target=aarch64-nintendo-nx-elf -o lj_vm.o -c lj_vm.s
+goto :DEBUGCHECK
+
+:NX32_CROSSBUILD
+@set LJCOMPILE="%NXCOMPILER_ROOT%\bin\clang" --target=armv7l-nintendo-nx-eabihf -Wall -I%NINTENDO_SDK_ROOT%\Include %DASMTARGET% -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -c
+@set LJLIB="%NXCOMPILER_ROOT%\bin\llvm-ar" rc
+@set TARGETLIB_SUFFIX=nx32
+
+%NXCOMPILER_ROOT%\bin\clang --target=armv7l-nintendo-nx-eabihf -o lj_vm.o -c lj_vm.s
+:DEBUGCHECK
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_DEBUG -g -O0
+@set TARGETLIB=libluajitD_%TARGETLIB_SUFFIX%.a
+goto :BUILD
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% -DNN_SDK_BUILD_RELEASE -O3
+@set TARGETLIB=libluajit_%TARGETLIB_SUFFIX%.a
+:BUILD
+del %TARGETLIB%
+@set LJCOMPILE=%LJCOMPILE% -fPIC
+@if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+  %LJCOMPILE% %%f
+  @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+@if errorlevel 1 goto :BAD
+@goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+@if errorlevel 1 goto :BAD
+:NOAMALG
+
+@del *.o *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for Nintendo Switch (%TARGETLIB_SUFFIX%) ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Native Tools Command Prompt for VS".
+@echo.
+@echo Either the x86 version for NX32, or x64 for the NX64 target.
+@echo This is because the pointer size of the LuaJIT host tools (buildvm.exe)
+@echo must match the cross-compiled target (32 or 64 bits).
+@echo.
+@echo Keep in mind that NintendoSDK + NX Addon must be installed, too.
+:END
diff --git a/lib/luajit-04dca791/src/ps4build.bat b/lib/luajit-04dca791/src/ps4build.bat
index d6f73e5ab40..801514ffde3 100644
--- a/lib/luajit-04dca791/src/ps4build.bat
+++ b/lib/luajit-04dca791/src/ps4build.bat
@@ -1,127 +1,127 @@
-@rem Script to build LuaJIT with the PS4 SDK.
-@rem Donated to the public domain.
-@rem
-@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
-@rem or "VS2015 x64 Native Tools Command Prompt".
-@rem
-@rem Then cd to this directory and run this script.
-@rem
-@rem Recommended invocation:
-@rem
-@rem ps4build        release build, amalgamated, 64-bit GC
-@rem ps4build debug    debug build, amalgamated, 64-bit GC
-@rem
-@rem Additional command-line options (not generally recommended):
-@rem
-@rem gc32 (before debug)    32-bit GC
-@rem noamalg (after debug)  non-amalgamated build
-
-@if not defined INCLUDE goto :FAIL
-@if not defined SCE_ORBIS_SDK_DIR goto :FAIL
-
-@setlocal
-@rem ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-@set GC64=
-@set DASC=vm_x64.dasc
-
-@if "%1" neq "gc32" goto :NOGC32
-@shift
-@set GC64=-DLUAJIT_DISABLE_GC64
-@set DASC=vm_x86.dasc
-:NOGC32
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Check for 64 bit host compiler.
-@minilua
-@if not errorlevel 8 goto :FAIL
-
-@set DASMFLAGS=-D P64 -D NO_UNWIND
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c
-
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@rem ---- Cross compiler ----
-@set LJCOMPILE="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-clang" -c -Wall -DLUAJIT_DISABLE_FFI %GC64%
-@set LJLIB="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-ar" rcus
-@set INCLUDE=""
-
-"%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-as" -o lj_vm.o lj_vm.s
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set LJCOMPILE=%LJCOMPILE% -g -O0
-@set TARGETLIB=libluajitD_ps4.a
-goto :BUILD
-:NODEBUG
-@set LJCOMPILE=%LJCOMPILE% -O2
-@set TARGETLIB=libluajit_ps4.a
-:BUILD
-del %TARGETLIB%
-@if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
-  %LJCOMPILE% %%f
-  @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
-@if errorlevel 1 goto :BAD
-@goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
-@if errorlevel 1 goto :BAD
-:NOAMALG
-
-@del *.o *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for PS4 ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Visual Studio .NET Command Prompt"
-@echo (64 bit host compiler). The PS4 Orbis SDK must be installed, too.
-:END
+@rem Script to build LuaJIT with the PS4 SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+@rem or "VS2015 x64 Native Tools Command Prompt".
+@rem
+@rem Then cd to this directory and run this script.
+@rem
+@rem Recommended invocation:
+@rem
+@rem ps4build        release build, amalgamated, 64-bit GC
+@rem ps4build debug    debug build, amalgamated, 64-bit GC
+@rem
+@rem Additional command-line options (not generally recommended):
+@rem
+@rem gc32 (before debug)    32-bit GC
+@rem noamalg (after debug)  non-amalgamated build
+
+@if not defined INCLUDE goto :FAIL
+@if not defined SCE_ORBIS_SDK_DIR goto :FAIL
+
+@setlocal
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+@set GC64=
+@set DASC=vm_x64.dasc
+
+@if "%1" neq "gc32" goto :NOGC32
+@shift
+@set GC64=-DLUAJIT_DISABLE_GC64
+@set DASC=vm_x86.dasc
+:NOGC32
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Check for 64 bit host compiler.
+@minilua
+@if not errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D P64 -D NO_UNWIND
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC -DLUAJIT_NO_UNWIND host\buildvm*.c
+
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set LJCOMPILE="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-clang" -c -Wall -DLUAJIT_DISABLE_FFI %GC64%
+@set LJLIB="%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-ar" rcus
+@set INCLUDE=""
+
+"%SCE_ORBIS_SDK_DIR%\host_tools\bin\orbis-as" -o lj_vm.o lj_vm.s
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% -g -O0
+@set TARGETLIB=libluajitD_ps4.a
+goto :BUILD
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% -O2
+@set TARGETLIB=libluajit_ps4.a
+:BUILD
+del %TARGETLIB%
+@if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+  %LJCOMPILE% %%f
+  @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+@if errorlevel 1 goto :BAD
+@goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+@if errorlevel 1 goto :BAD
+:NOAMALG
+
+@del *.o *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for PS4 ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (64 bit host compiler). The PS4 Orbis SDK must be installed, too.
+:END
diff --git a/lib/luajit-04dca791/src/ps5build.bat b/lib/luajit-04dca791/src/ps5build.bat
index 30b719d63a4..48e9e004c00 100644
--- a/lib/luajit-04dca791/src/ps5build.bat
+++ b/lib/luajit-04dca791/src/ps5build.bat
@@ -1,126 +1,126 @@
-@rem Script to build LuaJIT with the PS5 SDK.
-@rem Donated to the public domain.
-@rem
-@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
-@rem or "VS20xx x64 Native Tools Command Prompt".
-@rem
-@rem Then cd to this directory and run this script.
-@rem
-@rem Recommended invocation:
-@rem
-@rem ps5build        release build, amalgamated, 64-bit GC
-@rem ps5build debug    debug build, amalgamated, 64-bit GC
-@rem
-@rem Additional command-line options (not generally recommended):
-@rem
-@rem gc32 (before debug)    32-bit GC
-@rem noamalg (after debug)  non-amalgamated build
-
-@if not defined INCLUDE goto :FAIL
-@if not defined SCE_PROSPERO_SDK_DIR goto :FAIL
-
-@setlocal
-@rem ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-@set GC64=
-@set DASC=vm_x64.dasc
-
-@if "%1" neq "gc32" goto :NOGC32
-@shift
-@set GC64=-DLUAJIT_DISABLE_GC64
-@set DASC=vm_x86.dasc
-:NOGC32
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Check for 64 bit host compiler.
-@minilua
-@if not errorlevel 8 goto :FAIL
-
-@set DASMFLAGS=-D P64 -D NO_UNWIND
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@rem ---- Cross compiler ----
-@set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC %GC64%
-@set LJLIB="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-ar" rcus
-@set INCLUDE=""
-
-"%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -o lj_vm.o lj_vm.s
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set LJCOMPILE=%LJCOMPILE% -g -O0
-@set TARGETLIB=libluajitD_ps5.a
-goto :BUILD
-:NODEBUG
-@set LJCOMPILE=%LJCOMPILE% -O2
-@set TARGETLIB=libluajit_ps5.a
-:BUILD
-del %TARGETLIB%
-@if "%1" neq "noamalg" goto :AMALG
-for %%f in (lj_*.c lib_*.c) do (
-  %LJCOMPILE% %%f
-  @if errorlevel 1 goto :BAD
-)
-
-%LJLIB% %TARGETLIB% lj_*.o lib_*.o
-@if errorlevel 1 goto :BAD
-@goto :NOAMALG
-:AMALG
-%LJCOMPILE% ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
-@if errorlevel 1 goto :BAD
-:NOAMALG
-
-@del *.o *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for PS5 ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Visual Studio .NET Command Prompt"
-@echo (64 bit host compiler). The PS5 Prospero SDK must be installed, too.
-:END
+@rem Script to build LuaJIT with the PS5 SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+@rem or "VS20xx x64 Native Tools Command Prompt".
+@rem
+@rem Then cd to this directory and run this script.
+@rem
+@rem Recommended invocation:
+@rem
+@rem ps5build        release build, amalgamated, 64-bit GC
+@rem ps5build debug    debug build, amalgamated, 64-bit GC
+@rem
+@rem Additional command-line options (not generally recommended):
+@rem
+@rem gc32 (before debug)    32-bit GC
+@rem noamalg (after debug)  non-amalgamated build
+
+@if not defined INCLUDE goto :FAIL
+@if not defined SCE_PROSPERO_SDK_DIR goto :FAIL
+
+@setlocal
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+@set GC64=
+@set DASC=vm_x64.dasc
+
+@if "%1" neq "gc32" goto :NOGC32
+@shift
+@set GC64=-DLUAJIT_DISABLE_GC64
+@set DASC=vm_x86.dasc
+:NOGC32
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Check for 64 bit host compiler.
+@minilua
+@if not errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D P64 -D NO_UNWIND
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% %GC64% -DLUAJIT_TARGET=LUAJIT_ARCH_X64 -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLUAJIT_NO_UNWIND host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set LJCOMPILE="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -Wall -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC %GC64%
+@set LJLIB="%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-llvm-ar" rcus
+@set INCLUDE=""
+
+"%SCE_PROSPERO_SDK_DIR%\host_tools\bin\prospero-clang" -c -o lj_vm.o lj_vm.s
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% -g -O0
+@set TARGETLIB=libluajitD_ps5.a
+goto :BUILD
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% -O2
+@set TARGETLIB=libluajit_ps5.a
+:BUILD
+del %TARGETLIB%
+@if "%1" neq "noamalg" goto :AMALG
+for %%f in (lj_*.c lib_*.c) do (
+  %LJCOMPILE% %%f
+  @if errorlevel 1 goto :BAD
+)
+
+%LJLIB% %TARGETLIB% lj_*.o lib_*.o
+@if errorlevel 1 goto :BAD
+@goto :NOAMALG
+:AMALG
+%LJCOMPILE% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB% %TARGETLIB% ljamalg.o lj_vm.o
+@if errorlevel 1 goto :BAD
+:NOAMALG
+
+@del *.o *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for PS5 ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (64 bit host compiler). The PS5 Prospero SDK must be installed, too.
+:END
diff --git a/lib/luajit-04dca791/src/psvitabuild.bat b/lib/luajit-04dca791/src/psvitabuild.bat
index 8d176e52fb9..8ea97cebd12 100644
--- a/lib/luajit-04dca791/src/psvitabuild.bat
+++ b/lib/luajit-04dca791/src/psvitabuild.bat
@@ -1,96 +1,96 @@
-@rem Script to build LuaJIT with the PS Vita SDK.
-@rem Donated to the public domain.
-@rem
-@rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
-@rem Then cd to this directory and run this script.
-
-@if not defined INCLUDE goto :FAIL
-@if not defined SCE_PSP2_SDK_DIR goto :FAIL
-
-@setlocal
-@rem ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Check for 32 bit host compiler.
-@minilua
-@if errorlevel 8 goto :FAIL
-
-@set DASMFLAGS=-D FPU -D HFABI
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m elfasm -o lj_vm.s
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@rem ---- Cross compiler ----
-@set LJCOMPILE="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2snc" -c -w -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC
-@set LJLIB="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2ld32" -r --output=
-@set INCLUDE=""
-
-"%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2as" -o lj_vm.o lj_vm.s
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set LJCOMPILE=%LJCOMPILE% -g -O0
-@set TARGETLIB=libluajitD.a
-goto :BUILD
-:NODEBUG
-@set LJCOMPILE=%LJCOMPILE% -O2
-@set TARGETLIB=libluajit.a
-:BUILD
-del %TARGETLIB%
-
-%LJCOMPILE% ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB%%TARGETLIB% ljamalg.o lj_vm.o
-@if errorlevel 1 goto :BAD
-
-@del *.o *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for PS Vita ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Visual Studio .NET Command Prompt"
-@echo (32 bit host compiler). The PS Vita SDK must be installed, too.
-:END
+@rem Script to build LuaJIT with the PS Vita SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
+@rem Then cd to this directory and run this script.
+
+@if not defined INCLUDE goto :FAIL
+@if not defined SCE_PSP2_SDK_DIR goto :FAIL
+
+@setlocal
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Check for 32 bit host compiler.
+@minilua
+@if errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D FPU -D HFABI
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_arm.dasc
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% -DLUAJIT_TARGET=LUAJIT_ARCH_ARM -DLUAJIT_OS=LUAJIT_OS_OTHER -DLUAJIT_DISABLE_JIT -DLUAJIT_DISABLE_FFI -DLJ_TARGET_PSVITA=1 host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m elfasm -o lj_vm.s
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set LJCOMPILE="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2snc" -c -w -DLUAJIT_DISABLE_FFI -DLUAJIT_USE_SYSMALLOC
+@set LJLIB="%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2ld32" -r --output=
+@set INCLUDE=""
+
+"%SCE_PSP2_SDK_DIR%\host_tools\build\bin\psp2as" -o lj_vm.o lj_vm.s
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set LJCOMPILE=%LJCOMPILE% -g -O0
+@set TARGETLIB=libluajitD.a
+goto :BUILD
+:NODEBUG
+@set LJCOMPILE=%LJCOMPILE% -O2
+@set TARGETLIB=libluajit.a
+:BUILD
+del %TARGETLIB%
+
+%LJCOMPILE% ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB%%TARGETLIB% ljamalg.o lj_vm.o
+@if errorlevel 1 goto :BAD
+
+@del *.o *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for PS Vita ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (32 bit host compiler). The PS Vita SDK must be installed, too.
+:END
diff --git a/lib/luajit-04dca791/src/xb1build.bat b/lib/luajit-04dca791/src/xb1build.bat
index 019d6ebe7d8..2c6be0ca835 100644
--- a/lib/luajit-04dca791/src/xb1build.bat
+++ b/lib/luajit-04dca791/src/xb1build.bat
@@ -1,104 +1,104 @@
-@rem Script to build LuaJIT with the Xbox One SDK.
-@rem Donated to the public domain.
-@rem
-@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
-@rem Then cd to this directory and run this script.
-
-@if not defined INCLUDE goto :FAIL
-@if not defined DurangoXDK goto :FAIL
-
-@setlocal
-@echo ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Error out for 64 bit host compiler
-@minilua
-@if not errorlevel 8 goto :FAIL
-
-@set DASMFLAGS=-D WIN -D FFI -D P64
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m peobj -o lj_vm.obj
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@echo ---- Cross compiler ----
-
-@set CWD=%cd%
-@call "%DurangoXDK%\xdk\DurangoVars.cmd" XDK
-@cd /D "%CWD%"
-@shift
-
-@set LJCOMPILE="cl" /nologo /c /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /D_LIB /D_UNICODE /D_DURANGO
-@set LJLIB="lib" /nologo
-
-@if "%1"=="debug" (
-  @shift
-  @set LJCOMPILE=%LJCOMPILE% /Zi /MDd /Od
-  @set LJLINK=%LJLINK% /debug 
-) else (
-  @set LJCOMPILE=%LJCOMPILE% /MD /O2 /DNDEBUG
-)
-
-@if "%1"=="amalg" goto :AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
-@if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit.lib lj_*.obj lib_*.obj
-@if errorlevel 1 goto :BAD
-@goto :NOAMALG
-:AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit.lib ljamalg.obj lj_vm.obj
-@if errorlevel 1 goto :BAD
-:NOAMALG
-
-@del *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for Xbox One ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Visual Studio .NET Command Prompt"
-@echo (64 bit host compiler). The Xbox One SDK must be installed, too.
-:END
+@rem Script to build LuaJIT with the Xbox One SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)
+@rem Then cd to this directory and run this script.
+
+@if not defined INCLUDE goto :FAIL
+@if not defined DurangoXDK goto :FAIL
+
+@setlocal
+@echo ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Error out for 64 bit host compiler
+@minilua
+@if not errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D WIN -D FFI -D P64
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m peobj -o lj_vm.obj
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@echo ---- Cross compiler ----
+
+@set CWD=%cd%
+@call "%DurangoXDK%\xdk\DurangoVars.cmd" XDK
+@cd /D "%CWD%"
+@shift
+
+@set LJCOMPILE="cl" /nologo /c /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /D_LIB /D_UNICODE /D_DURANGO
+@set LJLIB="lib" /nologo
+
+@if "%1"=="debug" (
+  @shift
+  @set LJCOMPILE=%LJCOMPILE% /Zi /MDd /Od
+  @set LJLINK=%LJLINK% /debug 
+) else (
+  @set LJCOMPILE=%LJCOMPILE% /MD /O2 /DNDEBUG
+)
+
+@if "%1"=="amalg" goto :AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit.lib lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :NOAMALG
+:AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit.lib ljamalg.obj lj_vm.obj
+@if errorlevel 1 goto :BAD
+:NOAMALG
+
+@del *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for Xbox One ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (64 bit host compiler). The Xbox One SDK must be installed, too.
+:END
diff --git a/lib/luajit-04dca791/src/xedkbuild.bat b/lib/luajit-04dca791/src/xedkbuild.bat
index 5444024eeae..a6814fe4082 100644
--- a/lib/luajit-04dca791/src/xedkbuild.bat
+++ b/lib/luajit-04dca791/src/xedkbuild.bat
@@ -1,95 +1,95 @@
-@rem Script to build LuaJIT with the Xbox 360 SDK.
-@rem Donated to the public domain.
-@rem
-@rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
-@rem Then cd to this directory and run this script.
-
-@if not defined INCLUDE goto :FAIL
-@if not defined XEDK goto :FAIL
-
-@setlocal
-@rem ---- Host compiler ----
-@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
-@set LJLINK=link /nologo
-@set LJMT=mt /nologo
-@set DASMDIR=..\dynasm
-@set DASM=%DASMDIR%\dynasm.lua
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
-
-%LJCOMPILE% host\minilua.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:minilua.exe minilua.obj
-@if errorlevel 1 goto :BAD
-if exist minilua.exe.manifest^
-  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
-
-@rem Error out for 64 bit host compiler
-@minilua
-@if errorlevel 8 goto :FAIL
-
-@set DASMFLAGS=-D GPR64 -D FRAME32 -D PPE -D SQRT -D DUALNUM
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
-@if errorlevel 1 goto :BAD
-
-if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
-minilua host\genversion.lua
-
-%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC  host\buildvm*.c
-@if errorlevel 1 goto :BAD
-%LJLINK% /out:buildvm.exe buildvm*.obj
-@if errorlevel 1 goto :BAD
-if exist buildvm.exe.manifest^
-  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
-
-buildvm -m peobj -o lj_vm.obj
-@if errorlevel 1 goto :BAD
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
-@if errorlevel 1 goto :BAD
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
-@if errorlevel 1 goto :BAD
-
-@rem ---- Cross compiler ----
-@set LJCOMPILE="%XEDK%\bin\win32\cl" /nologo /c /MT /O2 /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /DNDEBUG /D_XBOX /D_LIB /DLUAJIT_USE_SYSMALLOC
-@set LJLIB="%XEDK%\bin\win32\lib" /nologo
-@set "INCLUDE=%XEDK%\include\xbox"
-
-@if "%1" neq "debug" goto :NODEBUG
-@shift
-@set "LJCOMPILE=%LJCOMPILE% /Zi"
-:NODEBUG
-@if "%1"=="amalg" goto :AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
-@if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit20.lib lj_*.obj lib_*.obj
-@if errorlevel 1 goto :BAD
-@goto :NOAMALG
-:AMALG
-%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
-@if errorlevel 1 goto :BAD
-%LJLIB% /OUT:luajit20.lib ljamalg.obj lj_vm.obj
-@if errorlevel 1 goto :BAD
-:NOAMALG
-
-@del *.obj *.manifest minilua.exe buildvm.exe
-@echo.
-@echo === Successfully built LuaJIT for Xbox 360 ===
-
-@goto :END
-:BAD
-@echo.
-@echo *******************************************************
-@echo *** Build FAILED -- Please check the error messages ***
-@echo *******************************************************
-@goto :END
-:FAIL
-@echo To run this script you must open a "Visual Studio .NET Command Prompt"
-@echo (32 bit host compiler). The Xbox 360 SDK must be installed, too.
-:END
+@rem Script to build LuaJIT with the Xbox 360 SDK.
+@rem Donated to the public domain.
+@rem
+@rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler)
+@rem Then cd to this directory and run this script.
+
+@if not defined INCLUDE goto :FAIL
+@if not defined XEDK goto :FAIL
+
+@setlocal
+@rem ---- Host compiler ----
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE
+@set LJLINK=link /nologo
+@set LJMT=mt /nologo
+@set DASMDIR=..\dynasm
+@set DASM=%DASMDIR%\dynasm.lua
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
+
+%LJCOMPILE% host\minilua.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:minilua.exe minilua.obj
+@if errorlevel 1 goto :BAD
+if exist minilua.exe.manifest^
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe
+
+@rem Error out for 64 bit host compiler
+@minilua
+@if errorlevel 8 goto :FAIL
+
+@set DASMFLAGS=-D GPR64 -D FRAME32 -D PPE -D SQRT -D DUALNUM
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_ppc.dasc
+@if errorlevel 1 goto :BAD
+
+if exist ..\.git ( git show -s --format=%%ct >luajit_relver.txt ) else ( type ..\.relver >luajit_relver.txt )
+minilua host\genversion.lua
+
+%LJCOMPILE% /I "." /I %DASMDIR% /D_XBOX_VER=200 /DLUAJIT_TARGET=LUAJIT_ARCH_PPC  host\buildvm*.c
+@if errorlevel 1 goto :BAD
+%LJLINK% /out:buildvm.exe buildvm*.obj
+@if errorlevel 1 goto :BAD
+if exist buildvm.exe.manifest^
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe
+
+buildvm -m peobj -o lj_vm.obj
+@if errorlevel 1 goto :BAD
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
+@if errorlevel 1 goto :BAD
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@if errorlevel 1 goto :BAD
+
+@rem ---- Cross compiler ----
+@set LJCOMPILE="%XEDK%\bin\win32\cl" /nologo /c /MT /O2 /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /DNDEBUG /D_XBOX /D_LIB /DLUAJIT_USE_SYSMALLOC
+@set LJLIB="%XEDK%\bin\win32\lib" /nologo
+@set "INCLUDE=%XEDK%\include\xbox"
+
+@if "%1" neq "debug" goto :NODEBUG
+@shift
+@set "LJCOMPILE=%LJCOMPILE% /Zi"
+:NODEBUG
+@if "%1"=="amalg" goto :AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit20.lib lj_*.obj lib_*.obj
+@if errorlevel 1 goto :BAD
+@goto :NOAMALG
+:AMALG
+%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c
+@if errorlevel 1 goto :BAD
+%LJLIB% /OUT:luajit20.lib ljamalg.obj lj_vm.obj
+@if errorlevel 1 goto :BAD
+:NOAMALG
+
+@del *.obj *.manifest minilua.exe buildvm.exe
+@echo.
+@echo === Successfully built LuaJIT for Xbox 360 ===
+
+@goto :END
+:BAD
+@echo.
+@echo *******************************************************
+@echo *** Build FAILED -- Please check the error messages ***
+@echo *******************************************************
+@goto :END
+:FAIL
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"
+@echo (32 bit host compiler). The Xbox 360 SDK must be installed, too.
+:END
diff --git a/plugins/in_http/http_prot.c b/plugins/in_http/http_prot.c
index 188591e4d0d..41cde52d56f 100644
--- a/plugins/in_http/http_prot.c
+++ b/plugins/in_http/http_prot.c
@@ -523,8 +523,9 @@ static int process_payload(struct flb_http *ctx, struct http_conn *conn,
         return -1;
     }
 
-    if (header->val.len == 16 &&
-        strncasecmp(header->val.data, "application/json", 16) == 0) {
+    if (header->val.len >= 16 &&
+        (strncasecmp(header->val.data, "application/json ", 17) == 0 ||
+        strncasecmp(header->val.data, "application/json;", 17) == 0)) {
         type = HTTP_CONTENT_JSON;
     }
 
diff --git a/tests/runtime/in_http.c b/tests/runtime/in_http.c
index c949288fd4d..e403b7bf3b2 100644
--- a/tests/runtime/in_http.c
+++ b/tests/runtime/in_http.c
@@ -28,6 +28,7 @@
 #include "flb_tests_runtime.h"
 
 #define JSON_CONTENT_TYPE "application/json"
+#define JSON_CHARSET_CONTENT_TYPE "application/json; charset=utf-8"
 
 struct http_client_ctx {
     struct flb_upstream      *u;
@@ -350,14 +351,97 @@ void flb_test_http_successful_response_code(char *response_code)
     test_ctx_destroy(ctx);
 }
 
+void flb_test_http_json_charset_header(char *response_code)
+{
+    struct flb_lib_out_cb cb_data;
+    struct test_ctx *ctx;
+    struct flb_http_client *c;
+    int ret;
+    int num;
+    size_t b_sent;
+
+    char *buf = "[{\"test\":\"msg\"}]";
+
+    clear_output_num();
+
+    cb_data.cb = cb_check_result_json;
+    cb_data.data = "\"test\":\"msg\"";
+
+    ctx = test_ctx_create(&cb_data);
+    if (!TEST_CHECK(ctx != NULL)) {
+        TEST_MSG("test_ctx_create failed");
+        exit(EXIT_FAILURE);
+    }
+
+    ret = flb_input_set(ctx->flb, ctx->i_ffd,
+                        "http2", "off",
+                        "successful_response_code", response_code,
+                         NULL);
+    TEST_CHECK(ret == 0);
+
+    ret = flb_output_set(ctx->flb, ctx->o_ffd,
+                         "match", "*",
+                         "format", "json",
+                         NULL);
+    TEST_CHECK(ret == 0);
+
+    /* Start the engine */
+    ret = flb_start(ctx->flb);
+    TEST_CHECK(ret == 0);
+
+    ctx->httpc = http_client_ctx_create();
+    TEST_CHECK(ctx->httpc != NULL);
+
+    flb_time_msleep(1500);
+
+    c = flb_http_client(ctx->httpc->u_conn, FLB_HTTP_POST, "/", buf, strlen(buf),
+                        "127.0.0.1", 9880, NULL, 0);
+    ret = flb_http_add_header(c, FLB_HTTP_HEADER_CONTENT_TYPE, strlen(FLB_HTTP_HEADER_CONTENT_TYPE),
+                              JSON_CHARSET_CONTENT_TYPE, strlen(JSON_CHARSET_CONTENT_TYPE));
+    TEST_CHECK(ret == 0);
+    if (!TEST_CHECK(c != NULL)) {
+        TEST_MSG("http_client failed");
+        exit(EXIT_FAILURE);
+    }
+
+    ret = flb_http_do(c, &b_sent);
+    if (!TEST_CHECK(ret == 0)) {
+        TEST_MSG("ret error. ret=%d\n", ret);
+    }
+    else if (!TEST_CHECK(b_sent > 0)){
+        TEST_MSG("b_sent size error. b_sent = %lu\n", b_sent);
+    }
+    else if (!TEST_CHECK(c->resp.status == atoi(response_code))) {
+        TEST_MSG("http response code error. expect: %d, got: %d\n", atoi(response_code), c->resp.status);
+    }
+
+    /* waiting to flush */
+    flb_time_msleep(1500);
+
+    num = get_output_num();
+    if (!TEST_CHECK(num > 0))  {
+        TEST_MSG("no outputs");
+    }
+    flb_http_client_destroy(c);
+    flb_upstream_conn_release(ctx->httpc->u_conn);
+    test_ctx_destroy(ctx);
+}
+
 void flb_test_http_successful_response_code_200()
 {
-    flb_test_http_successful_response_code("200");    
+    flb_test_http_successful_response_code("200");  
+    flb_test_http_json_charset_header("200");    
 }
 
 void flb_test_http_successful_response_code_204()
 {
-    flb_test_http_successful_response_code("204");    
+    flb_test_http_successful_response_code("204");  
+    flb_test_http_json_charset_header("204");    
+}
+
+void flb_test_http_json_charset_header_200()
+{
+    flb_test_http_json_charset_header("200");    
 }
 
 void flb_test_http_failure_400_bad_json() {
@@ -588,6 +672,7 @@ TEST_LIST = {
     {"successful_response_code_204", flb_test_http_successful_response_code_204},
     {"failure_response_code_400_bad_json", flb_test_http_failure_400_bad_json},
     {"failure_response_code_400_bad_disk_write", flb_test_http_failure_400_bad_disk_write},
+    {"json_charset_header", flb_test_http_json_charset_header_200},
     {"tag_key", flb_test_http_tag_key},
     {NULL, NULL}
 };