Merge branch 'master' of github.com:bkaradzic/bgfx

makefile

@@ -13,7 +13,7 @@ all:
 	premake4 --file=premake/premake4.lua --gcc=nacl-arm gmake
 	premake4 --file=premake/premake4.lua --gcc=pnacl gmake
 	premake4 --file=premake/premake4.lua --gcc=mingw gmake
-	premake4 --file=premake/premake4.lua --gcc=linux gmake
+	premake4 --file=premake/premake4.lua --gcc=linux-gcc gmake
 	premake4 --file=premake/premake4.lua --gcc=osx gmake
 	premake4 --file=premake/premake4.lua --gcc=ios-arm gmake
 	premake4 --file=premake/premake4.lua --gcc=ios-simulator gmake

premake/premake4.lua

@@ -100,7 +100,7 @@ function exampleProject(_name, _uuid)
 			"pthread",
 		}
 
-	configuration { "linux" }
+	configuration { "linux-*" }
 		links {
 			"X11",
 			"GL",