From a749775045e797785bee9873db7afb905712ca60 Mon Sep 17 00:00:00 2001
From: Stinkfist0 <stinkfist0@gmail.com>
Date: Tue, 3 Nov 2015 16:55:33 +0200
Subject: [PATCH] build-deps.cmd: use OpenCOLLADA from the official repo now
 that it has the static MSVC run-time option.

---
 win/build-deps.cmd | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index dc17888e22..8b3c41a890 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -202,17 +202,8 @@ IF EXIST "%DEPS_DIR%\icu-55.1-vs%VS_VER%\". (
 :: Note OpenCOLLADA has only Release and Debug builds.
 set DEPENDENCY_NAME=OpenCOLLADA
 set DEPENDENCY_DIR=%DEPS_DIR%\OpenCOLLADA
-:: TODO Temporarily use our own repo until the upstream has static VC runtime option
-call :GitCloneOrPullRepository https://github.com/Tridify/OpenCOLLADA.git "%DEPENDENCY_DIR%"
-REM call :GitCloneOrPullRepository https://github.com/KhronosGroup/OpenCOLLADA.git "%DEPENDENCY_DIR%"
+call :GitCloneOrPullRepository https://github.com/KhronosGroup/OpenCOLLADA.git "%DEPENDENCY_DIR%"
 IF NOT %ERRORLEVEL%==0 GOTO :Error
-IF NOT EXIST "%DEPENDENCY_DIR%\%BUILD_DIR%". (
-    cd "%DEPENDENCY_DIR%"
-    call git branch vs-static-rt origin/vs-static-rt
-    IF NOT %ERRORLEVEL%==0 GOTO :Error
-    call git checkout vs-static-rt
-    IF NOT %ERRORLEVEL%==0 GOTO :Error
-)
 cd "%DEPENDENCY_DIR%"
 :: NOTE OpenCOLLADA has been observed to have problems with switching between debug and release builds so
 :: uncomment to following line in order to delete the CMakeCache.txt always if experiencing problems.