Merge branch 'master' into nazara-next

This commit is contained in:
Jérôme Leclercq
2020-09-17 20:28:11 +02:00
270 changed files with 106800 additions and 334 deletions

View File

@@ -9,10 +9,6 @@ LIBRARY.Files = {
"../thirdparty/src/Lua/*.cpp"
}
LIBRARY.OsDefines.Windows = {
"LUA_USE_WINDOWS"
}
LIBRARY.OsDefines.Posix = {
"LUA_USE_LINUX"
}

38
thirdparty/build/newton.lua vendored Normal file
View File

@@ -0,0 +1,38 @@
LIBRARY.Name = "newton"
LIBRARY.Defines = {
"_CRT_SECURE_NO_WARNINGS",
"_NEWTON_STATIC_LIB",
}
LIBRARY.OsDefines.Windows = {
"_WINDOWS"
}
LIBRARY.Language = "C++"
LIBRARY.Files = {
"../thirdparty/include/newton/**.h",
"../thirdparty/src/newton/**.h",
"../thirdparty/src/newton/**.c",
"../thirdparty/src/newton/**.cpp",
}
LIBRARY.Includes = {
"../thirdparty/src/newton/dgCore",
"../thirdparty/src/newton/dgMeshUtil",
"../thirdparty/src/newton/dgPhysics",
"../thirdparty/src/newton/dgNewton",
"../thirdparty/src/newton/dContainers",
"../thirdparty/src/newton/dMath"
}
LIBRARY.Custom = function()
vectorextensions("SSE3")
filter({"architecture:x86_64", "system:linux"})
defines("_POSIX_VER_64")
filter({"architecture:x86", "system:linux"})
defines("_POSIX_VER")
end