Revert "demos: use -o on glslangValidator to allow parallel make"

This reverts commit 2d83e06b0dacb8b4d1364b816ce10e56829e048a.
Do not want to make this change at this time.

diff --git a/LunarGLASS_revision b/LunarGLASS_revision
index fc15416..113c4d2 100644 (file)
--- a/LunarGLASS_revision
+++ b/LunarGLASS_revision
@@ -1 +1 @@
-1095
+1093

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 1eea0d7..6b48fcd 100644 (file)
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -52,20 +52,44 @@ if(WIN32)
 endif()
 if(NOT WIN32)
     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 
+       COMMAND rm -rf tri-vert-dir
+       COMMAND mkdir tri-vert-dir
+       COMMAND cd tri-vert-dir
+       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
+       COMMAND mv vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
+       COMMAND cd ..
+       COMMAND rm -rf tri-vert-dir
        DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
        )
     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
+       COMMAND rm -rf tri-frag-dir
+       COMMAND mkdir tri-frag-dir
+       COMMAND cd tri-frag-dir
+       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
+       COMMAND mv frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
+       COMMAND cd ..
+       COMMAND rm -rf tri-frag-dir
        DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
        )
     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
+       COMMAND rm -rf cube-vert-dir
+       COMMAND mkdir cube-vert-dir
+       COMMAND cd cube-vert-dir
+       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
+       COMMAND mv vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
+       COMMAND cd ..
+       COMMAND rm -rf cube-vert-dir
        DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
        )
 
     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
+       COMMAND rm -rf cube-frag-dir
+       COMMAND mkdir cube-frag-dir
+       COMMAND cd cube-frag-dir
+       COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
+       COMMAND mv frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
+       COMMAND cd ..
+       COMMAND rm -rf cube-frag-dir
        DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
        )
 endif()

diff --git a/glslang_revision b/glslang_revision
index 0ba895a..565eaa4 100644 (file)
--- a/glslang_revision
+++ b/glslang_revision
@@ -1 +1 @@
-3a194f7ba46b747411181736203f9389a5406d81
+e6f7988adec197e0590fb8274b0412811456d3e6