diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-08 09:06:53 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-08 09:40:20 -0600 |
| commit | 298320b12df0c862ea0ce84f8c100d9e8fc5a802 (patch) | |
| tree | c122f9f1c5ffb8ee13f551c35737595ba92b7b51 | |
| parent | 9ce1bdea5cc06f9ce5bee31cfdb97fe7f2a8b177 (diff) | |
| download | usermoji-298320b12df0c862ea0ce84f8c100d9e8fc5a802.tar.xz | |
misc: do not need pull if using git checkout
Also remove unused R32 variable and file now that
we can get latest glslang from git.
| -rw-r--r-- | glslang_revision_R32 | 1 | ||||
| -rwxr-xr-x | update_external_sources.sh | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/glslang_revision_R32 b/glslang_revision_R32 deleted file mode 100644 index 0a8c17e1..00000000 --- a/glslang_revision_R32 +++ /dev/null @@ -1 +0,0 @@ -32031 diff --git a/update_external_sources.sh b/update_external_sources.sh index cade2b6d..fce9e5e7 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -9,9 +9,7 @@ echo "LUNARGLASS_REVISION=$LUNARGLASS_REVISION" echo "GLSLANG_REVISION=$GLSLANG_REVISION" LUNARGLASS_REVISION_R32=$(cat $PWD/LunarGLASS_revision_R32) -GLSLANG_REVISION_R32=$(cat $PWD/glslang_revision_R32) echo "LUNARGLASS_REVISION_R32=$LUNARGLASS_REVISION_R32" -echo "GLSLANG_REVISION_R32=$GLSLANG_REVISION_R32" BUILDDIR=$PWD BASEDIR=$BUILDDIR/.. @@ -22,18 +20,14 @@ function create_glslang () { mkdir -p $BASEDIR/glslang cd $BASEDIR/glslang git clone git@gitlab.khronos.org:GLSL/glslang.git . - git branch --track Rev32 origin/Rev32 - git checkout Rev32 - # git checkout $GLSLANG_REVISION + git checkout $GLSLANG_REVISION } function update_glslang () { echo "Updating $BASEDIR/glslang" cd $BASEDIR/glslang git fetch --all - git checkout Rev32 - git checkout -f . - # git checkout $GLSLANG_REVISION + git checkout $GLSLANG_REVISION } function create_LunarGLASS () { |