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

This commit is contained in:
bkaradzic 2013-11-19 21:38:27 -08:00
commit bdf099e834
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

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