diff options
| author | ruki <[email protected]> | 2018-10-10 23:23:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-10-10 14:20:19 +0800 |
| commit | 3a0638eb9411258a790d6735f677e12018a6d43d (patch) | |
| tree | 4a74940335d65fe9815ac0ea873859c131ef8238 | |
| parent | 54425048a21fa961ad528e64d7f9aba7d49b8f9a (diff) | |
fix link conflicts
| -rw-r--r-- | core/src/tbox/xmake.lua | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c++/console_tbox/project/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c++/shared_library_tbox/project/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c++/static_library_tbox/project/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c/console_tbox/project/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c/shared_library_tbox/project/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/templates/c/static_library_tbox/project/xmake.lua | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/core/src/tbox/xmake.lua b/core/src/tbox/xmake.lua index 8032b2c08..9f057b294 100644 --- a/core/src/tbox/xmake.lua +++ b/core/src/tbox/xmake.lua @@ -117,7 +117,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- include project sources diff --git a/core/xmake.lua b/core/xmake.lua index cd2999cc0..18403c1c1 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -31,7 +31,7 @@ add_cxflags("-fomit-frame-pointer") -- for the windows platform (msvc) if is_plat("windows") then add_cxflags("-MT") - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") add_links("kernel32", "user32", "gdi32") end diff --git a/xmake/templates/c++/console_tbox/project/xmake.lua b/xmake/templates/c++/console_tbox/project/xmake.lua index 4d531ccc9..68cc9cfb7 100644 --- a/xmake/templates/c++/console_tbox/project/xmake.lua +++ b/xmake/templates/c++/console_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package diff --git a/xmake/templates/c++/shared_library_tbox/project/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/xmake.lua index 2da1492f0..4b16c1995 100644 --- a/xmake/templates/c++/shared_library_tbox/project/xmake.lua +++ b/xmake/templates/c++/shared_library_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package diff --git a/xmake/templates/c++/static_library_tbox/project/xmake.lua b/xmake/templates/c++/static_library_tbox/project/xmake.lua index 2da1492f0..4b16c1995 100644 --- a/xmake/templates/c++/static_library_tbox/project/xmake.lua +++ b/xmake/templates/c++/static_library_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package diff --git a/xmake/templates/c/console_tbox/project/xmake.lua b/xmake/templates/c/console_tbox/project/xmake.lua index 4d531ccc9..68cc9cfb7 100644 --- a/xmake/templates/c/console_tbox/project/xmake.lua +++ b/xmake/templates/c/console_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package diff --git a/xmake/templates/c/shared_library_tbox/project/xmake.lua b/xmake/templates/c/shared_library_tbox/project/xmake.lua index 2da1492f0..4b16c1995 100644 --- a/xmake/templates/c/shared_library_tbox/project/xmake.lua +++ b/xmake/templates/c/shared_library_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package diff --git a/xmake/templates/c/static_library_tbox/project/xmake.lua b/xmake/templates/c/static_library_tbox/project/xmake.lua index 2da1492f0..4b16c1995 100644 --- a/xmake/templates/c/static_library_tbox/project/xmake.lua +++ b/xmake/templates/c/static_library_tbox/project/xmake.lua @@ -61,7 +61,7 @@ if is_plat("windows") then end -- no msvcrt.lib - add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_ldflags("-nodefaultlib:msvcrt.lib") end -- the base package |