Merge branch 'master' of https://github.com/erwincoumans/bullet3

2018-06-16 12:28:38 -07:00
parent 7924d51665 9326fff75a
commit c55720fb41
2 changed files with 7 additions and 2 deletions
--- a/examples/RobotSimulator/premake4.lua
+++ b/examples/RobotSimulator/premake4.lua
@@ -275,8 +275,13 @@ if not _OPTIONS["no-enet"] then
 	if os.is("MacOSX") then
 		links{"Cocoa.framework"}
 	end
+
+	
+	if os.is("Linux") then initX11()
+                     links {"pthread"}
+        end
+
 	
-		
 		files {
 			 "HelloBulletRobotics.cpp"
 		}