workaround of premake for link error on Ubuntu/Linux, see

https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-319/+bug/1248642
2014-05-05 13:47:00 -07:00
parent a1febdcf3d
commit c1940169bc
8 changed files with 18 additions and 5 deletions
--- a/Demos3/AllBullet2Demos/premake4.lua
+++ b/Demos3/AllBullet2Demos/premake4.lua
@@ -48,7 +48,7 @@
 		"../GpuDemos/gwenUserInterface.h"
 		}

-if os.is("Linux") then links{"X11"} end
+if os.is("Linux") then links{"X11","pthread"} end
 if os.is("MacOSX") then
                        links{"Cocoa.framework"}
 end
--- a/Demos3/GpuDemos/premake4.lua
+++ b/Demos3/GpuDemos/premake4.lua
@@ -91,7 +91,7 @@ function createProject(vendor)
 			}
 		end
 		if os.is("Linux") then
-			links{"X11"}
+			links{"X11","pthread"}
 			files {
 				"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
 				"../../btgui/OpenGLWindow/X11OpenGLWindows.h"
--- a/Demos3/GpuGuiInitialize/premake4.lua
+++ b/Demos3/GpuGuiInitialize/premake4.lua
@@ -68,7 +68,7 @@ function createProject(vendor)
 			}
 		end
 		if os.is("Linux") then
-			links {"X11"}
+			links {"X11","pthread"}
 			files {
 				"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
 				"../../btgui/OpenGLWindow/X11OpenGLWindows.h"
--- a/Demos3/ImplicitCloth/premake4.lua
+++ b/Demos3/ImplicitCloth/premake4.lua
@@ -61,6 +61,7 @@ if os.is("Windows") then
 		"../../btgui/OpenGLWindow/X11OpenGLWindow.h",
 		"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp"
 		}
+		links{"pthread"}
 	end
 	if os.is("MacOSX") then
 		links{"Cocoa.framework"}
--- a/Demos3/SimpleOpenGL3/premake4.lua
+++ b/Demos3/SimpleOpenGL3/premake4.lua
@@ -27,7 +27,7 @@

 		}
 		
-if os.is("Linux") then links {"X11"} end
+if os.is("Linux") then links {"X11","pthread"} end

 if os.is("MacOSX") then
 	links{"Cocoa.framework"}