sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into NDK

Browse Source 
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
This commit is contained in:
Lynix
2015-09-20 23:41:21 +02:00
parent ea3644ef44 f1c8d09a82
commit b16abf0d09
45 changed files with 3702 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/scripts/modules/renderer.lua
View File

@@ -15,8 +15,8 @@ MODULE.OsFiles.Windows = {
}
MODULE.OsFiles.Posix = {
"../src/Nazara/Renderer/Posix/**.hpp",
"../src/Nazara/Renderer/Posix/**.cpp"
"../src/Nazara/Renderer/GLX/**.hpp",
"../src/Nazara/Renderer/GLX/**.cpp"
}
MODULE.OsLibraries.Windows = {

4
build/scripts/modules/utility.lua
View File

@@ -12,8 +12,8 @@ MODULE.OsFiles.Windows = {
}
MODULE.OsFiles.Posix = {
"../src/Nazara/Utility/Posix/**.hpp",
"../src/Nazara/Utility/Posix/**.cpp"
"../src/Nazara/Utility/X11/**.hpp",
"../src/Nazara/Utility/X11/**.cpp"
}
MODULE.OsLibraries.Windows = {