From a442d2ecec63bcf90c51c642fb452e032fa93997 Mon Sep 17 00:00:00 2001
From: FelixBrendel <felix.brendel@freenet.de>
Date: Mon, 6 Apr 2020 00:12:25 +0200
Subject: [PATCH] Hopefully better ifdefs for checking OS so the ci doesn't
 error

---
 3rd/ftb               |  2 +-
 src/define_macros.hpp |  2 +-
 src/defines.cpp       |  2 +-
 src/libslime.cpp      |  3 ++-
 src/main.cpp          |  2 +-
 src/platform.cpp      | 10 +++++-----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/3rd/ftb b/3rd/ftb
index 39dbfa3..a77b139 160000
--- a/3rd/ftb
+++ b/3rd/ftb
@@ -1 +1 @@
-Subproject commit 39dbfa3db926c78eda8ab086b93e8be8c2828b99
+Subproject commit a77b1393050001991382a9bac3f395cf9c463f32
diff --git a/src/define_macros.hpp b/src/define_macros.hpp
index 478da18..23a3746 100644
--- a/src/define_macros.hpp
+++ b/src/define_macros.hpp
@@ -83,7 +83,7 @@
     _13, _14, _15, _16, _17, _18,               \
     _19, _20, _21, _22, _23, _24,               \
     NAME, ...) NAME
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
 #define EXPAND( x ) x
 #define fetch(...) EXPAND(                                              \
         GET_MACRO(                                                      \
diff --git a/src/defines.cpp b/src/defines.cpp
index 95b152f..1bb1d57 100644
--- a/src/defines.cpp
+++ b/src/defines.cpp
@@ -8,7 +8,7 @@
 #endif
 
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(_WIN32) || defined(WIN32) || defined(_WIN64)
 # define SLIME_WINDOWS
 # define debug_break() if_debug __debugbreak()
 # define if_windows if constexpr (true)
diff --git a/src/libslime.cpp b/src/libslime.cpp
index 5b6c024..bbabed4 100644
--- a/src/libslime.cpp
+++ b/src/libslime.cpp
@@ -12,7 +12,8 @@
 #include <errno.h>
 #include <new>
 
-#ifdef _MSC_VER
+
+#if defined(_MSC_VER) || defined(_WIN32) || defined(WIN32) || defined(_WIN64)
 #  include <direct.h>
 #  include <windows.h>
 #else
diff --git a/src/main.cpp b/src/main.cpp
index dfc603b..4f9fc76 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 #include "libslime.cpp"
 
 s32 main(s32 argc, char* argv[]) {
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
     // enable colored terminal output for windows
     HANDLE hOut  = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD dwMode = 0;
diff --git a/src/platform.cpp b/src/platform.cpp
index 6fafce2..0252f40 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -4,7 +4,7 @@ namespace Slime {
         const u32 buf_size = 2048;
         char* res = (char*)malloc(buf_size * sizeof(char));
 
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
         _getcwd(res, buf_size);
 #else
         getcwd(res, buf_size);
@@ -14,7 +14,7 @@ namespace Slime {
     }
 
     inline proc change_cwd(char* dir) -> void {
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
         _chdir(dir);
 #else
         chdir(dir);
@@ -22,7 +22,7 @@ namespace Slime {
     }
 
     inline proc duplicate_c_string(const char* str) -> char* {
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
         return _strdup(str);
 #else
         return strdup(str);
@@ -30,7 +30,7 @@ namespace Slime {
     }
 
 
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
     s32 vasprintf(char **strp, const char *fmt, va_list ap) {
         // _vscprintf tells you how big the buffer needs to be
         s32 len = _vscprintf(fmt, ap);
@@ -62,7 +62,7 @@ namespace Slime {
 #endif
 
     proc get_exe_dir() -> path_char* {
-#ifdef _MSC_VER
+#ifdef SLIME_WINDOWS
         DWORD last_error;
         DWORD result;
         DWORD path_size = MAX_PATH;