Merge pull request #13 from Przemog1/armageddon_2

Armageddon 2

Author: devshgraphicsprogramming

.gitmodules

@@ -7,6 +7,7 @@
 [submodule "3rdparty/glslang"]
 	path = 3rdparty/glslang
 	url = https://github.com/devshgraphicsprogramming/glslang.git
+	branch = nabla
 [submodule "3rdparty/shaderc"]
 	path = 3rdparty/shaderc
 	url = https://github.com/google/shaderc.git
@@ -18,7 +19,8 @@
 	url = https://github.com/lz4/lz4.git
 [submodule "3rdparty/spirv_cross"]
 	path = 3rdparty/spirv_cross
-	url = https://github.com/KhronosGroup/SPIRV-Cross.git
+	url = https://github.com/devshgraphicsprogramming/SPIRV-Cross.git
+	branch = nabla
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib
 	url = https://github.com/madler/zlib.git

3rdparty/CMakeLists.txt

@@ -125,6 +125,8 @@ set(ENABLE_SPVREMAPPER OFF CACHE BOOL "SPVRemapper is a spirv compression experi
 set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Build glslangValidator and spirv-remap?")
 set(BUILD_TESTING OFF CACHE BOOL "Enable glslang build testing?")
 add_subdirectory(glslang glslang EXCLUDE_FROM_ALL)
+# because we're integrating glslang via add_subdirectory(), build_info.h is generated to wrong directory (relative to Nabla root) so i have to add extra include dir
+target_include_directories(SPIRV PUBLIC "${GLSLANG_GENERATED_INCLUDEDIR}")
 
 set(SHADERC_SKIP_TESTS ON CACHE BOOL "Skip shaderc tests?")
 set(SHADERC_SKIP_INSTALL ON CACHE BOOL "Install shaderc?")
@@ -460,6 +462,8 @@ set(NBL_3RDPARTY_TARGETS
 				glslang
 				OGLCompiler 
 				OSDependent
+				MachineIndependent
+				GenericCodeGen
 				SPIRV 
 				Iex
 				IexMath

3rdparty/SPIRV-Headers

@@ -240,8 +240,6 @@ if(NBL_BUILD_TOOLS)
 	add_subdirectory(tools) # convert2BAW
 endif()
 
-add_subdirectory(ext)
-
 if(NBL_BUILD_EXAMPLES)
 	add_subdirectory(examples_tests)
 endif()

3rdparty/SPIRV-Tools

@@ -10,7 +10,7 @@
 //! I advise to check out this file, its a basic input handler
 #include "../common/QToQuitEventReceiver.h"
 
-//#include "../../ext/ScreenShot/ScreenShot.h"
+//#include "irr/ext/ScreenShot/ScreenShot.h"
 
 
 using namespace irr;