mirror of
https://github.com/Detanup01/gbe_fork.git
synced 2024-12-26 02:14:15 +08:00
add -MT flag to compiler flags only for vs projects, it has a different meaning on linux!
This commit is contained in:
parent
7f2fbf8ab0
commit
2201e94982
@ -183,11 +183,9 @@ local cmake_common_defs = {
|
|||||||
'CMAKE_BUILD_TYPE=Release',
|
'CMAKE_BUILD_TYPE=Release',
|
||||||
'CMAKE_POSITION_INDEPENDENT_CODE=True',
|
'CMAKE_POSITION_INDEPENDENT_CODE=True',
|
||||||
'BUILD_SHARED_LIBS=OFF',
|
'BUILD_SHARED_LIBS=OFF',
|
||||||
'CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded',
|
|
||||||
}
|
}
|
||||||
if os.target() == 'windows' then
|
if os.target() == 'windows' then
|
||||||
table.insert(cmake_common_defs, 'CMAKE_C_FLAGS_RELEASE="-MT -D_MT"')
|
table.insert(cmake_common_defs, 'CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded')
|
||||||
table.insert(cmake_common_defs, 'CMAKE_CXX_FLAGS_RELEASE="-MT -D_MT"')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -237,6 +235,18 @@ local function cmake_build(dep_folder, is_32, extra_defs)
|
|||||||
else
|
else
|
||||||
cmd_gen = cmd_gen .. ' -A x64'
|
cmd_gen = cmd_gen .. ' -A x64'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local toolchain_file = path.join(deps_dir, 'toolchain_vs.cmake')
|
||||||
|
-- these 2 are needed because mbedtls doesn't care about 'CMAKE_MSVC_RUNTIME_LIBRARY' for some reason
|
||||||
|
if not io.writefile(toolchain_file, [[
|
||||||
|
set(CMAKE_C_FLAGS_INIT "-MT -D_MT")
|
||||||
|
set(CMAKE_CXX_FLAGS_INIT "-MT -D_MT")
|
||||||
|
]]) then
|
||||||
|
error("failed to create vs cmake toolchain")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
cmd_gen = cmd_gen .. ' -DCMAKE_TOOLCHAIN_FILE="' .. toolchain_file .. '"'
|
||||||
else
|
else
|
||||||
error("unsupported action: " .. _ACTION)
|
error("unsupported action: " .. _ACTION)
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user