BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/Engine/CMakeLists.txt
This commit is contained in:
viktorljung
2015-12-03 15:03:52 +01:00
parent 0f33089039 64aa3a1064
commit 9654140fb2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/CMakeLists.txt
+2
View File
@@ -52,6 +52,7 @@ file(GLOB SOURCE_FILES_Rendering_Util
"${INCLUDE_PATH}/Rendering/Util/*.h" "${INCLUDE_PATH}/Rendering/Util/*.h"
"Rendering/Util/*.cpp" "Rendering/Util/*.cpp"
) )
source_group(Rendering FILES ${SOURCE_FILES_Rendering}) source_group(Rendering FILES ${SOURCE_FILES_Rendering})
source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util}) source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util})
@@ -67,6 +68,7 @@ set(SOURCE_FILES
#${SOURCE_FILES_Input} #${SOURCE_FILES_Input}
${SOURCE_FILES_GUI} ${SOURCE_FILES_GUI}
${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering}
${SOURCE_FILES_Rendering_Util}
) )
set(LIBRARIES set(LIBRARIES