diff --git a/include/compat/linux/sal.h b/include/compat/linux/sal.h new file mode 100644 index 0000000..23c9fc0 --- /dev/null +++ b/include/compat/linux/sal.h @@ -0,0 +1 @@ +#include "../mingw/salieri.h" diff --git a/include/compat/mingw/salieri.h b/include/compat/mingw/salieri.h index 06d7207..5942b39 100644 --- a/include/compat/mingw/salieri.h +++ b/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 diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 6fb00cc..7c49fd8 100644 --- a/scripts/toolchain.lua +++ b/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 {