Browse Source

Add salieri to linux include compatibility.

Бранимир Караџић 3 years ago
parent
commit
ab34c808e8
3 changed files with 19 additions and 1 deletions
  1. 1 0
      include/compat/linux/sal.h
  2. 16 0
      include/compat/mingw/salieri.h
  3. 2 1
      scripts/toolchain.lua

+ 1 - 0
include/compat/linux/sal.h

@@ -0,0 +1 @@
+#include "../mingw/salieri.h"

+ 16 - 0
include/compat/mingw/salieri.h

@@ -1598,6 +1598,22 @@
 #  define SALIERI_DEFINED_String_length
 #endif
 
+#if defined(_In_count_) && defined(SALIERI_DEFINED_In_count_)
+#  undef _In_count_
+#endif
+#if !defined(_In_count_)
+#  define _In_count_(param)
+#  define SALIERI_DEFINED_In_count_
+#endif
+
+#if defined(_In_opt_count_) && defined(SALIERI_DEFINED_In_opt_count_)
+#  undef _In_opt_count_
+#endif
+#if !defined(_In_opt_count_)
+#  define _In_opt_count_(param)
+#  define SALIERI_DEFINED_In_opt_count_
+#endif
+
 #if defined(SALIERI_VERSION)
 #  undef SALIERI_VERSION
 #endif

+ 2 - 1
scripts/toolchain.lua

@@ -700,7 +700,8 @@ function toolchain(_buildDir, _libDir)
 		}
 		buildoptions { "-m64" }
 
-	configuration { "linux-clang" }
+	configuration { "linux-*" }
+		includedirs { path.join(bxDir, "include/compat/linux") }
 
 	configuration { "linux-gcc-6" }
 		buildoptions {