Merge branch 'master' into vulkan

2018-04-26 22:48:49 +02:00
parent a2691ee12e 8695e11436
commit 43bb487801
191 changed files with 5200 additions and 3554 deletions
--- a/thirdparty/build/chipmunk.lua
+++ b/thirdparty/build/chipmunk.lua
@@ -1,6 +1,14 @@
 LIBRARY.Name = "chipmunk"

-LIBRARY.Defines = {"CP_USE_CGTYPES=0", "TARGET_OS_IPHONE=0", "TARGET_OS_MAC=0"}
+LIBRARY.Defines = {
+	"CP_USE_CGTYPES=0",
+	"DRAW_CLOSEST=0",
+	"DRAW_EPA=0",
+	"DRAW_GJK=0",
+	"TARGET_IPHONE_SIMULATOR=0",
+	"TARGET_OS_IPHONE=0",
+	"TARGET_OS_MAC=0",
+}

 LIBRARY.Language = "C++"