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

Build/Graphics: Fix conflict

Browse Source 
Former-commit-id: 48015e97d5e7a6b06406c7867f6119fa6be7c38a
This commit is contained in:
Lynix
2015-06-13 23:28:01 +02:00
parent b2a248d6f5
commit aee0812505
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/scripts/module/graphics.lua
View File

@@ -1,18 +1,7 @@
MODULE.Name = "Graphics" MODULE.Name = "Graphics"
<<<<<<< HEAD
defines "NAZARA_GRAPHICS_BUILD"
files
{
"../include/Nazara/Graphics/**.hpp",
"../include/Nazara/Graphics/**.inl",
"../src/Nazara/Graphics/**.hpp",
"../src/Nazara/Graphics/**.cpp"
=======
MODULE.Libraries = { MODULE.Libraries = {
"NazaraCore", "NazaraCore",
"NazaraUtility", "NazaraUtility",
"NazaraRenderer" "NazaraRenderer"
>>>>>>> origin/BuildSystem-Update
} }