Skip to content
Snippets Groups Projects
Commit 2a2d5599 authored by Franck Galpin's avatar Franck Galpin
Browse files

Merge branch 'fix_sadl_checkout' into 'VTM-11.0_nnvc'

use the submodule hash to retrieve the correct SADL commit instead of the latest version

See merge request jvet-ahg-nnvc/VVCSoftware_VTM!26
parents 3500236c c05ac32d
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ BUILD_SCRIPT := $(CURDIR)/cmake/CMakeBuild/bin/cmake.py ...@@ -18,6 +18,7 @@ BUILD_SCRIPT := $(CURDIR)/cmake/CMakeBuild/bin/cmake.py
TARGETS := CommonLib DecoderAnalyserApp DecoderAnalyserLib DecoderApp DecoderLib TARGETS := CommonLib DecoderAnalyserApp DecoderAnalyserLib DecoderApp DecoderLib
TARGETS += EncoderApp EncoderLib Utilities SEIRemovalApp StreamMergeApp TARGETS += EncoderApp EncoderLib Utilities SEIRemovalApp StreamMergeApp
SADL_HASH := "dedd0095bd3f8ca0a760eb0649b028a87b84dcfd" # hard coded because of windows $(shell git submodule status | grep sadl | cut -d' ' -f2)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
ifneq ($(MSYSTEM),) ifneq ($(MSYSTEM),)
...@@ -180,5 +181,7 @@ realclean: ...@@ -180,5 +181,7 @@ realclean:
sadlclean: sadlclean:
$(RM) -rf sadl $(RM) -rf sadl
git clone https://mpeg:${MPEGPWD}@vcgit.hhi.fraunhofer.de/jvet-ahg-nnvc/sadl.git sadl git clone https://mpeg:${MPEGPWD}@vcgit.hhi.fraunhofer.de/jvet-ahg-nnvc/sadl.git sadl
cd sadl && git checkout $(SADL_HASH)
.NOTPARALLEL: .NOTPARALLEL:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment