+diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
++++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
+@@ -72,7 +72,7 @@
+
+ if (BUILD_TESTS)
+ # Hard code our glslang path for now
+- get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE)
++ set(GLSLANG_PREFIX /usr/include/glslang)
+
+ if(NOT EXISTS ${GLSLANG_PREFIX})
+ message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX})
+diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/demos/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/demos/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/demos/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
++++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/demos/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
+@@ -28,45 +28,45 @@
+ endif()
+
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
+- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
++ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
+ COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
+- DEPENDS tri.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
++ DEPENDS tri.vert
+ )
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
+- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
++ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
+ COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
+- DEPENDS tri.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
++ DEPENDS tri.frag
+ )
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
+- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
++ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
+ COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
+- DEPENDS cube.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
++ DEPENDS cube.vert
+ )
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
+- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
++ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
+ COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
+- DEPENDS cube.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
++ DEPENDS cube.frag
+ )
+ file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
+ file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
+ file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
+ else()
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
+- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
+- DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
++ COMMAND glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
++ DEPENDS tri.vert
+ )
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
+- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
+- DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
++ COMMAND glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
++ DEPENDS tri.frag
+ )
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
+- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
+- DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
++ COMMAND glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
++ DEPENDS cube.vert
+ )
+
+ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
+- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
+- DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
++ COMMAND glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
++ DEPENDS cube.frag
+ )
+ endif()
+
+diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/layers/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/layers/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/layers/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
++++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/layers/CMakeLists.txt 2016-02-19 22:37:15.242851047 +0100
+@@ -26,7 +26,7 @@
+ VkLayer_device_limits
+ )
+
+-set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer)
++set(VK_LAYER_RPATH "${CMAKE_INSTALL_LIBDIR}/vulkan/layer")
+ set(CMAKE_INSTALL_RPATH ${VK_LAYER_RPATH})
+
+ if (NOT WIN32)
+@@ -79,7 +79,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/../loader
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
+ ${CMAKE_CURRENT_BINARY_DIR}
+- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
++ /usr/include/glslang/SPIRV
+ )
+
+ if (WIN32)
+diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/tests/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/tests/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/tests/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
++++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/tests/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
+@@ -67,13 +67,13 @@
+ IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
+ else ()
+ set_target_properties(glslang PROPERTIES
+- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libglslang.a")
++ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libglslang.a")
+ set_target_properties(OGLCompiler PROPERTIES
+- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOGLCompiler.a")
++ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a")
+ set_target_properties(OSDependent PROPERTIES
+- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOSDependent.a")
++ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOSDependent.a")
+ set_target_properties(SPIRV PROPERTIES
+- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libSPIRV.a")
++ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
+ endif()
+
+ include_directories(