Merge branch 'master' into vulkan

2020-02-23 00:46:48 +01:00
parent 8ba8d2e92f 9d88fcd649
commit 8be2342f25
382 changed files with 50494 additions and 5037 deletions
--- a/thirdparty/include/GL3/glcorearb.h
+++ b/thirdparty/include/GL3/glcorearb.h
--- a/thirdparty/include/GL3/glext.h
+++ b/thirdparty/include/GL3/glext.h
--- a/thirdparty/include/GL3/glxext.h
+++ b/thirdparty/include/GL3/glxext.h
--- a/thirdparty/include/GL3/wglext.h
+++ b/thirdparty/include/GL3/wglext.h
--- a/thirdparty/src/Lua/loadlib.cpp
+++ b/thirdparty/src/Lua/loadlib.cpp
@@ -176,6 +176,8 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 ** =======================================================================
 */

+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>

 #undef setprogdir
--- a/thirdparty/src/chipmunk/chipmunk.c
+++ b/thirdparty/src/chipmunk/chipmunk.c
@@ -89,7 +89,7 @@ cpAreaForSegment(cpVect a, cpVect b, cpFloat r)
 }

 cpFloat
-cpMomentForPoly(cpFloat m, const int count, const cpVect *verts, cpVect offset, cpFloat r)
+cpMomentForPoly(cpFloat m, int count, const cpVect *verts, cpVect offset, cpFloat r)
 {
 	// TODO account for radius.
 	if(count == 2) return cpMomentForSegment(m, verts[0], verts[1], 0.0f);