Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Fix building on clang, executable fail starting due to mixed allocators (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-01-04 13:28:40 +01:00
parent 9ffe6faa44
commit e0deb80b54
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/genie.lua
View File

@ -1058,7 +1058,19 @@ configuration { "osx*" }
"pthread", "pthread",
} }
configuration { "mingw*" } configuration { "mingw-clang" }
links {
"gcc",
"stdc++",
"user32",
"winmm",
"advapi32",
"shlwapi",
"wsock32",
"pthread",
}
configuration { "mingw*-gcc" }
linkoptions { linkoptions {
"-static-libgcc", "-static-libgcc",
"-static-libstdc++", "-static-libstdc++",

18
scripts/src/3rdparty.lua
View File

@ -251,6 +251,12 @@ if _OPTIONS["vs"]=="intel-15" then
} }
end end
configuration { "mingw-clang" }
defines {
"SIZE_MAX=UINT_MAX",
"SIZE_T_MAX=UINT_MAX",
}
configuration { "vs2015" } configuration { "vs2015" }
buildoptions { buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@ -378,6 +384,12 @@ project "lua"
buildoptions_c { buildoptions_c {
"-Wno-bad-function-cast" "-Wno-bad-function-cast"
} }
configuration { "mingw-clang" }
defines {
"LUA_USE_C89",
}
configuration { "vs*" } configuration { "vs*" }
buildoptions { buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@ -726,6 +738,7 @@ end
buildoptions { buildoptions {
"-Wno-unknown-attributes", "-Wno-unknown-attributes",
"-Wno-missing-braces", "-Wno-missing-braces",
"-Wno-int-to-pointer-cast",
} }
end end
end end
@ -942,6 +955,11 @@ project "gtest"
"-Wno-unused-variable", "-Wno-unused-variable",
} }
configuration { "mingw-clang" }
buildoptions {
"-O0", -- crash of compiler when doing optimization
}
configuration { "vs*" } configuration { "vs*" }
if _OPTIONS["vs"]=="intel-15" then if _OPTIONS["vs"]=="intel-15" then
buildoptions { buildoptions {

10
scripts/toolchain.lua
View File

@ -493,11 +493,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x32", "mingw-clang" } configuration { "x32", "mingw-clang" }
objdir ( _buildDir .. "mingw-clang/obj") objdir ( _buildDir .. "mingw-clang/obj")
buildoptions { "-m32" } buildoptions { "-m32" }
buildoptions {
"-isystem$(MINGW32)/i686-w64-mingw32/include/c++",
"-isystem$(MINGW32)/i686-w64-mingw32/include/c++/i686-w64-mingw32",
"-isystem$(MINGW32)/i686-w64-mingw32/include",
}
configuration { "x32", "mingw-clang", "Release" } configuration { "x32", "mingw-clang", "Release" }
targetdir (_buildDir .. "mingw-clang/bin/x32/Release") targetdir (_buildDir .. "mingw-clang/bin/x32/Release")
@ -508,11 +503,6 @@ function toolchain(_buildDir, _subDir)
configuration { "x64", "mingw-clang" } configuration { "x64", "mingw-clang" }
objdir (_buildDir .. "mingw-clang/obj") objdir (_buildDir .. "mingw-clang/obj")
buildoptions { "-m64" } buildoptions { "-m64" }
buildoptions {
"-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++",
"-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++/x86_64-w64-mingw32",
"-isystem$(MINGW64)/x86_64-w64-mingw32/include",
}
configuration { "x64", "mingw-clang", "Release" } configuration { "x64", "mingw-clang", "Release" }
targetdir (_buildDir .. "mingw-clang/bin/x64/Release") targetdir (_buildDir .. "mingw-clang/bin/x64/Release")