Buildable on Windows after changes on Linux

berezins · May 8, 2020 · 7812401 · 7812401
1 parent b1645c8
commit 7812401
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "deps/jwt-cpp"]
 	path = deps/jwt-cpp
 	url = https://github.com/Thalhammer/jwt-cpp.git
+[submodule "deps/openssl"]
+	path = deps/openssl
+	url = https://github.com/openssl/openssl.git
diff --git a/Poedit.vcxproj b/Poedit.vcxproj
@@ -52,7 +52,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>HAVE_CLD2;HAVE_HTTP_CLIENT;XML_STATIC;_NO_ASYNCRTIMP;WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;deps\custom_build\config;deps\wx\include;deps\boost;deps\winsparkle\include;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;deps\custom_build\config;deps\wx\include;deps\boost;deps\winsparkle\include;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;deps\jwt-cpp\include;deps\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
       <DisableSpecificWarnings>4800</DisableSpecificWarnings>
@@ -82,7 +82,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>HAVE_CLD2;HAVE_HTTP_CLIENT;XML_STATIC;_NO_ASYNCRTIMP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;deps\custom_build\config;deps\wx\include;deps\boost;deps\winsparkle\include;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;deps\custom_build\config;deps\wx\include;deps\boost;deps\winsparkle\include;deps\lucene;deps\lucene\LucenePlusPlus\include;deps\cld2;deps\icu4c\include;deps\icu4c\source\i18n;deps\casablanca\Release\include;deps\jwt-cpp\include;deps\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableSpecificWarnings>4800</DisableSpecificWarnings>
       <PrecompiledHeaderFile>Poedit-Prefix.pch</PrecompiledHeaderFile>

diff --git a/src/catalog_xliff.cpp b/src/catalog_xliff.cpp
@@ -33,6 +33,7 @@
 
 #include <wx/intl.h>
 #include <wx/log.h>
+#include <wx/stdpaths.h>
 
 #include <boost/algorithm/string.hpp>
 

diff --git a/src/http_client_casablanca.cpp b/src/http_client_casablanca.cpp
@@ -232,7 +232,14 @@ class http_client::impl
     {
         http::http_request req(http::methods::POST);
         for(const auto& h : hdrs) {
-            req.headers().add(h.first, h.second);
+            req.headers().add(
+                // Take care about conversion from std::string in case of
+                // std::wstring used in headers as well what is default
+                // for _WIN32 in cpprest for some reason
+                // (it's safe since we expect only ANSI in header names)
+                utility::string_t(h.first.begin(), h.first.end()),
+                h.second
+            );
         }
         req.headers().add(http::header_names::user_agent, m_userAgent);
         req.headers().add(http::header_names::accept_language, ui_language);

diff --git a/src/version.h b/src/version.h
@@ -26,7 +26,7 @@
 #ifndef Poedit_version_h
 #define Poedit_version_h
 
-#define POEDIT_VERSION           "2.3"
-#define POEDIT_VERSION_WIN        2,3,0
+#define POEDIT_VERSION           "2.4.7dev"
+#define POEDIT_VERSION_WIN        2,4,7
 
 #endif // Poedit_version_h
diff --git a/win32/poedit.iss b/win32/poedit.iss
@@ -25,12 +25,12 @@
 ;
 
 #ifndef CONFIG
-#define CONFIG           "Release"
+#define CONFIG           "Debug"
 #endif
 
 #include "../" + CONFIG + "/git_build_number.h"
 
-#define VERSION          "2.3"
+#define VERSION          "2.4.7"
 #define VERSION_WIN      VERSION + "." + Str(POEDIT_GIT_BUILD_NUMBER)
 
 #ifndef CRT_REDIST