Commit fac009c0 authored by Georg Schaefer's avatar Georg Schaefer
Browse files

Merge branch 'develop' into feature/rendering/deferred_shading

parents 9d20cf07 64ef036b
......@@ -69,8 +69,9 @@ workspace "gdw_ss15_cpp"
files "src/**.cpp"
configuration {"gmake", "linux"}
links {"GL", "GLEW", "SDL2", "SDL2_mixer" , "Recast","Detour","DetourCrowd","DebugUtils","nanovg"}
configuration {"gmake", "linux" }
linkoptions {"build/libnanovg.a"}
links {"GL", "GLEW", "SDL2", "SDL2_mixer" , "Recast","Detour","DetourCrowd","DebugUtils"}
configuration {"gmake", "windows"}
postbuildcommands {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment