scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-17 20:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
makefile
View file

@ -13,7 +13,7 @@ all:
premake4 --file=premake/premake4.lua --gcc=nacl-arm gmake premake4 --file=premake/premake4.lua --gcc=nacl-arm gmake
premake4 --file=premake/premake4.lua --gcc=pnacl gmake premake4 --file=premake/premake4.lua --gcc=pnacl gmake
premake4 --file=premake/premake4.lua --gcc=mingw 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=osx gmake
premake4 --file=premake/premake4.lua --gcc=ios-arm gmake premake4 --file=premake/premake4.lua --gcc=ios-arm gmake
premake4 --file=premake/premake4.lua --gcc=ios-simulator gmake premake4 --file=premake/premake4.lua --gcc=ios-simulator gmake

2
premake/premake4.lua
View file

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