Add support for MinGW-w64 (#735)

Add  support for MinGW-w64 under MSYS2 environment.
Currently requires curl and libbcrypt installed.

Resolves: OLPSUP-9555

Signed-off-by: Serhii Lozynskyi <[email protected]>

Author: meravingen123

olp-cpp-sdk-authentication/CMakeLists.txt

@@ -37,6 +37,11 @@ target_link_libraries(${PROJECT_NAME}
         ${PROJECT_LIBS}
 )
 
+# On MINGW boost uses bcrypt library
+if (MINGW)
+    target_link_libraries(${PROJECT_NAME} PRIVATE bcrypt )
+endif()
+
 target_compile_definitions(${PROJECT_NAME}
     PRIVATE AUTHENTICATION_LIBRARY)
 if(BUILD_SHARED_LIBS)

olp-cpp-sdk-core/CMakeLists.txt

@@ -30,7 +30,7 @@ include(cmake/CompileChecks.cmake)
 
 porting_do_checks()
 
-if(ANDROID OR IOS OR WIN32)
+if(ANDROID OR IOS OR (WIN32 AND NOT MINGW))
     set(NETWORK_NO_CURL ON)
 
     if(ANDROID)
@@ -262,9 +262,13 @@ if (IOS)
 endif()
 
 if (WIN32)
-    set(OLP_SDK_HTTP_SOURCES ${OLP_SDK_HTTP_SOURCES} ${OLP_SDK_HTTP_WIN_SOURCES})
-
-    set(OLP_SDK_DEFAULT_NETWORK_DEFINITION OLP_SDK_NETWORK_HAS_WINHTTP)
+    if (MINGW)
+        set(OLP_SDK_HTTP_SOURCES ${OLP_SDK_HTTP_SOURCES} ${OLP_SDK_HTTP_CURL_SOURCES})
+        set(OLP_SDK_DEFAULT_NETWORK_DEFINITION OLP_SDK_NETWORK_HAS_CURL)
+    else()
+        set(OLP_SDK_HTTP_SOURCES ${OLP_SDK_HTTP_SOURCES} ${OLP_SDK_HTTP_WIN_SOURCES})
+        set(OLP_SDK_DEFAULT_NETWORK_DEFINITION OLP_SDK_NETWORK_HAS_WINHTTP)
+    endif()
 endif()
 
 set(OLP_SDK_PLATFORM_SOURCES
@@ -399,7 +403,7 @@ elseif(ANDROID)
     add_dependencies(${PROJECT_NAME} ${OLP_SDK_ANDROID_HTTP_CLIENT_JAR})
 endif()
 
-if(CURL_FOUND)
+if(CURL_FOUND AND NOT MINGW)
     include(CheckIncludeFile)
     check_include_file(signal.h HAVE_SIGNAL_H)
     if(HAVE_SIGNAL_H)

olp-cpp-sdk-core/cmake/curl.cmake

@@ -20,7 +20,7 @@ if(CURL_FOUND AND NOT NETWORK_NO_CURL)
 
     add_definitions(-DOLP_SDK_NETWORK_HAS_CURL)
     set(OLP_SDK_NETWORK_CURL_LIBRARIES ${CURL_LIBRARIES})
-    if(WIN32)
+    if(WIN32 AND NOT MINGW)
         set(OLP_SDK_NETWORK_CURL_LIBRARIES ${OLP_SDK_NETWORK_CURL_LIBRARIES} ws2_32)
     endif()
     if(APPLE)

olp-cpp-sdk-core/cmake/winhttp.cmake

@@ -14,7 +14,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
-if(WIN32)
+if(WIN32 AND NOT MINGW)
     set(OLP_SDK_HTTP_WIN_SOURCES
         "${CMAKE_CURRENT_LIST_DIR}/../src/http/winhttp/NetworkWinHttp.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/../src/http/winhttp/NetworkWinHttp.h"

olp-cpp-sdk-core/src/utils/Dir.cpp

@@ -19,7 +19,7 @@
 
 #include "olp/core/utils/Dir.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
@@ -35,15 +35,16 @@
 #include <unistd.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #define G_COUNTOF(array) (sizeof(array) / sizeof(array[0]))
 #endif
 
 namespace olp {
 namespace utils {
 
 namespace {
-#if defined(_WIN32) && defined(_UNICODE)
+#if defined(_WIN32) && !defined(__MINGW32__)
+#ifdef _UNICODE
 std::wstring ConvertStringToWideString(const std::string& str) {
   int size_needed =
       MultiByteToWideChar(CP_ACP, 0, &str[0], str.size(), NULL, 0);
@@ -52,9 +53,10 @@ std::wstring ConvertStringToWideString(const std::string& str) {
                       size_needed);
   return wstr_path;
 }
-#endif  // _WIN32 && _UNICODE
+#endif // _UNICODE
+#endif // _WIN32 && _MINGW32
 
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(__MINGW32__)
 int remove_dir_callback(const char* file, const struct stat* /*stat*/, int flag,
                         struct FTW* /*buf*/) {
   int rc = 0;
@@ -100,7 +102,11 @@ static bool mkdir_all(const char* dirname, int mode) {
 
     std::string subdir(ptr, end - ptr);
 
+#if defined(__MINGW32__)
+    int rc = mkdir(subdir.c_str());
+#else
     int rc = mkdir(subdir.c_str(), mode);
+#endif
     if (rc != 0 && errno != EEXIST) {
       return false;
     }
@@ -116,8 +122,8 @@ static bool mkdir_all(const char* dirname, int mode) {
 }
 #endif  // ifndef _WIN32
 
-#ifdef _WIN32
-static void Tokenize(const std::string& path, const std::string& delimiters,
+#if defined(_WIN32) && !defined(__MINGW32__)
+void Tokenize(const std::string& path, const std::string& delimiters,
                      std::vector<std::string>& result) {
   std::string sub_path = path;
   while (1) {
@@ -208,8 +214,7 @@ bool DeleteDirectory(const TCHAR* utfdirPath) {
 }  // namespace
 
 bool Dir::Exists(const std::string& path) {
-#ifdef _WIN32
-
+#if defined(_WIN32) && !defined(MINGW32)
 #ifdef _UNICODE
   std::wstring wstr_path = ConvertStringToWideString(path);
   const TCHAR* syspath = wstr_path.c_str();
@@ -245,7 +250,7 @@ bool Dir::exists(const std::string& path) { return Dir::Exists(path); }
 
 bool Dir::Remove(const std::string& path) {
   bool ret = true;
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #ifdef _UNICODE
   std::wstring wstrPath = ConvertStringToWideString(path);
   const TCHAR* n_path = wstrPath.c_str();
@@ -271,7 +276,7 @@ bool Dir::Create(const std::string& path) {
     return true;
   }
   bool ret = true;
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(__MINGW32__)
   struct stat sbuf;
   if (stat(path.c_str(), &sbuf) != 0) {
     if (!mkdir_all(path.c_str(), 0777)) {
@@ -323,7 +328,7 @@ bool Dir::Create(const std::string& path) {
 bool Dir::create(const std::string& path) { return Dir::Create(path); }
 
 std::string Dir::TempDirectory() {
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
   wchar_t path[MAX_PATH];
   ::GetTempPathW(MAX_PATH, path);
 
@@ -365,7 +370,7 @@ std::string Dir::TempDirectory() {
 }
 
 bool Dir::FileExists(const std::string& file_path) {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 #ifdef _UNICODE
   std::wstring wstrPath = ConvertStringToWideString(file_path);
   const TCHAR* syspath = wstrPath.c_str();