Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering

# Conflicts: # src/Engine/CMakeLists.txt
2015-12-03 15:03:52 +01:00
parent 0f33089039 64aa3a1064
commit 9654140fb2
1 changed files with 2 additions and 0 deletions
@@ -52,6 +52,7 @@ file(GLOB SOURCE_FILES_Rendering_Util
    "${INCLUDE_PATH}/Rendering/Util/*.h"
    "Rendering/Util/*.cpp"
 )
+
 source_group(Rendering FILES ${SOURCE_FILES_Rendering})
 source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util})

@@ -67,6 +68,7 @@ set(SOURCE_FILES
    #${SOURCE_FILES_Input}
    ${SOURCE_FILES_GUI}
    ${SOURCE_FILES_Rendering}
+    ${SOURCE_FILES_Rendering_Util}
 )

 set(LIBRARIES