Merge remote-tracking branch 'upstream/master'

examples/ThirdPartyLibs/BussIK/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+INCLUDE_DIRECTORIES(
+	.
+)
+
+
+FILE(GLOB BussIK_SRCS "*.cpp" )
+FILE(GLOB BussIK_HDRS "*.h" )
+
+ADD_LIBRARY(BussIK ${BussIK_SRCS} ${BussIK_HDRS})

examples/ThirdPartyLibs/BussIK/Misc.cpp

@@ -23,7 +23,7 @@ subject to the following restrictions:
 #include <math.h>
 #include "LinearR3.h"
 
-#include "../OpenGLWindow/OpenGLInclude.h"
+
 
 /****************************************************************
 							 Axes 

examples/ThirdPartyLibs/BussIK/premake4.lua

@@ -0,0 +1,11 @@
+	project "BussIK"
+		
+	kind "StaticLib"
+
+	includedirs {
+		"."
+	}
+	files {
+		"*.cpp",
+		"*.h",
+	}