Package mingw64

core/lib/spdlog/include/spdlog/details/spdlog_impl.h

@@ -17,7 +17,9 @@
 #endif
 
 #ifdef _WIN32
-#include <spdlog/sinks/wincolor_sink.h>
+#define UNDEF_WIN_32 _WIN32
+#undef _WIN32
+#include <spdlog/sinks/ansicolor_sink.h>
 #else
 #include <spdlog/sinks/ansicolor_sink.h>
 #endif
@@ -243,3 +245,8 @@ inline void spdlog::drop_all()
 {
     details::registry::instance().drop_all();
 }
+
+#ifdef UNDEF_WIN_32
+#define _WIN32 UNDEF_WIN_32
+#undef UNDEF_WIN_32
+#endif

core/test/preferences/json_preferences_test.cpp

@@ -150,7 +150,7 @@ TEST(JsonPreferences, StoreAndGetWithPreferencesAPI) {
                     ->putString("my_string", "Hello World!")
                     ->putBoolean("my_bool", true)
                     ->putInt("my_int", 42)
-                    ->putLong("my_long", 42L << 42)
+                    ->putLong("my_long", 42LL << 42LL)
                     ->putStringArray("my_string_array", std::vector<std::string>({"Hello", "world", "!"}))
                     ->commit();
         }));
@@ -168,7 +168,7 @@ TEST(JsonPreferences, StoreAndGetWithPreferencesAPI) {
             EXPECT_EQ(preferences->getString("my_fake_string", "Not My String"), "Not My String");
             EXPECT_EQ(preferences->getString("my_string_to_remove", ""), "Remove this please!");
             EXPECT_EQ(preferences->getInt("my_int", -1), 42);
-            EXPECT_EQ(preferences->getLong("my_long", -1),  42L << 42);
+            EXPECT_EQ(preferences->getLong("my_long", -1),  42LL << 42LL);
             EXPECT_EQ(preferences->getBoolean("my_bool", false), true);
             EXPECT_EQ(preferences->getStringArray("my_string_array", {}), std::vector<std::string>({"Hello", "world", "!"}));
             preferences->edit()->remove("my_string_to_remove")->commit();
@@ -208,7 +208,7 @@ TEST(JsonPreferences, LoadAndGetWithPreferencesAPI) {
             EXPECT_EQ(preferences->getString("my_fake_string", "Not My String"), "Not My String");
             EXPECT_EQ(preferences->getString("my_string_to_remove", ""), "Remove this please!");
             EXPECT_EQ(preferences->getInt("my_int", -1), 42);
-            EXPECT_EQ(preferences->getLong("my_long", -1),  42L << 42);
+            EXPECT_EQ(preferences->getLong("my_long", -1),  42LL << 42LL);
             EXPECT_EQ(preferences->getBoolean("my_bool", false), true);
             EXPECT_EQ(preferences->getStringArray("my_string_array", {}), std::vector<std::string>({"Hello", "world", "!"}));
             dispatcher->stop();

setup_on_travis.sh

@@ -7,7 +7,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     sudo apt-get -o Dpkg::Options::="--force-all" -y --force-yes install gcc-5 g++-5
     sudo cp /bin/true /usr/bin/dpkg-maintscript-helper
     sudo apt-get -o Dpkg::Options::="--force-all" -y --force-yes install mingw-w64
-
+    bcd ash tools/install_mingw64.sh
 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
    brew update
    brew upgrade cmake || true

tools/install_mingw64.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+mkdir tools/mingw64_tmp/ && cp tools/mingw64/* tools/mingw64_tmp/
+cd tools/mingw64_tmp
+for file in *.xz; do
+    tar xvf ${file}
+done
+sudo rsync -lrK usr /