diff options
| author | ruki <[email protected]> | 2022-04-30 00:56:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-04-30 00:56:36 +0800 |
| commit | a901b3786b2e11bede78a90ab41eb9a7200f31b7 (patch) | |
| tree | d3ec4f15dbb383b24b3f9a9f356dc61d14b81ece | |
| parent | 9f24c274381f9636c058a950080edab8b934e9e7 (diff) | |
add vs_toolset
| -rw-r--r-- | tests/projects/c++/shared_library/src/interface.h | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/xmake.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/projects/c++/shared_library/src/interface.h b/tests/projects/c++/shared_library/src/interface.h index ef24ba3ce..57b6194de 100644 --- a/tests/projects/c++/shared_library/src/interface.h +++ b/tests/projects/c++/shared_library/src/interface.h @@ -7,10 +7,10 @@ extern "C" { #elif defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) # define __export __attribute__((visibility("default"))) #else -# define __export +# define __export #endif -/*! calculate add(a, b) +/*! calculate add(a, b) * * @param a the first argument * @param b the second argument diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua index a0934db1e..b521b5a84 100644 --- a/xmake/modules/package/tools/xmake.lua +++ b/xmake/modules/package/tools/xmake.lua @@ -86,7 +86,7 @@ function _get_configs(package, configs) end end else - local names = {"ndk", "ndk_sdkver", "vs", "mingw", "ld", "sh", "ar", "cc", "cxx", "mm", "mxx"} + local names = {"ndk", "ndk_sdkver", "vs", "vs_toolset", "mingw", "ld", "sh", "ar", "cc", "cxx", "mm", "mxx"} for _, name in ipairs(names) do local value = get_config(name) if value ~= nil then |