From e849dfb9fa467f0c3e5a3352ec35ba212b9df22f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 22 Oct 2018 14:58:23 -0400
Subject: DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version.

Also, on Windows, put build output into
build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding
build-vc120-$AUTOBUILD_ADDRSIZE.
---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index e35028ad6e..545c913f92 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ build_dir_Linux()
 
 build_dir_CYGWIN()
 {
-  echo build-vc120-${AUTOBUILD_ADDRSIZE}
+  echo build-vc${AUTOBUILD_VSVER:-120}-${AUTOBUILD_ADDRSIZE}
 }
 
 viewer_channel_suffix()
-- 
cgit v1.2.3


From 636989c13924f77615e8ffa58e5727780e8c5063 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Tue, 30 Apr 2019 19:01:51 -0600
Subject: [DRTVWR-476] - target windows 10

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 545c913f92..bafee86206 100755
--- a/build.sh
+++ b/build.sh
@@ -140,6 +140,7 @@ pre_build()
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
+     -DCMAKE_SYSTEM_VERSION:STRING="10.0" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" \
      -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
-- 
cgit v1.2.3


From b09770946a8ae3396517c6796d1bff2a1707de26 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 15 May 2019 03:57:10 -0600
Subject: [DRTVWR-476] - disable dbghelp.h warnings

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index bafee86206..545c913f92 100755
--- a/build.sh
+++ b/build.sh
@@ -140,7 +140,6 @@ pre_build()
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
-     -DCMAKE_SYSTEM_VERSION:STRING="10.0" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" \
      -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
-- 
cgit v1.2.3