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

2013-08-22 23:16:02 -07:00
parent 2c019d579f 74948ede54
commit f12fe0237b
6 changed files with 20 additions and 9 deletions
--- a/btgui/GwenOpenGLTest/premake4.lua
+++ b/btgui/GwenOpenGLTest/premake4.lua
@@ -56,6 +56,7 @@
 	}
 	end
 	if os.is("Linux") then 
+		links ("X11")
 		files{
 		"../OpenGLWindow/X11OpenGLWindow.h",
 		"../OpenGLWindow/X11OpenGLWindow.cpp"
--- a/btgui/OpenGLTrueTypeFont/premake4.lua
+++ b/btgui/OpenGLTrueTypeFont/premake4.lua
@@ -46,6 +46,7 @@
 			}
 		end
 		if os.is("Linux") then 
+			links{"X11"}
 			files{
 				"../OpenGLWindow/X11OpenGLWindow.h",
 				"../OpenGLWindow/X11OpenGLWindow.cpp"