Commit Graph

3 Commits

Author SHA1 Message Date
Youri Hubaut 752518ef14 Fix module compilation on linux
Former-commit-id: 205c6578fd50e506ec7d6012e73fea0c14c744d9
2015-09-27 15:37:45 +02:00
Lynix b16abf0d09 Merge branch 'master' into NDK
Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
Lynix 71e595fe49 Build: Rework build system + introduced SDK build file
Former-commit-id: 90727a78031a83753404d2fe09a6347315a00a39
2015-06-14 15:48:16 +02:00