From b99fcdb30ab65be55aefadaa187849525f189500 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 13 Feb 2020 21:44:46 +0200
Subject: SL-12707 Build Fails Without FMOD

Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
---
 indra/cmake/Copy3rdPartyLibs.cmake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c73a1fdb47..2781c10f19 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -71,6 +71,10 @@ if(WINDOWS)
         endif(ADDRESS_SIZE EQUAL 32)
     endif (FMODEX)
 
+    if (OPENAL)
+        list(APPEND release_files openal32.dll alut.dll)
+    endif (OPENAL)
+
     #*******************************
     # Copy MS C runtime dlls, required for packaging.
     # *TODO - Adapt this to support VC9
-- 
cgit v1.2.3


From 583f532b172e25aaf8da531f2cd407df9b2793fa Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 21 Feb 2020 11:52:46 +0200
Subject: SL-12708 (Windows) Eliminate DirectX SDK June 2010 Install
 Requirement

---
 indra/cmake/DirectX.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/cmake')

diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
index 25163d0322..1741dc111f 100644
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
@@ -1,8 +1,15 @@
 # -*- cmake -*-
 
 if (WINDOWS)
+  if(ADDRESS_SIZE EQUAL 32)
+    set(PROGRAMFILES_x86 $ENV{PROGRAMFILES})
+  else(ADDRESS_SIZE EQUAL 32)
+    set(PROGRAMFILES_x86 $ENV{PROGRAMFILES\(X86\)})
+  endif(ADDRESS_SIZE EQUAL 32)
+
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
+            "${PROGRAMFILES_x86}/Windows Kits/8.1/Include/um"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
@@ -26,6 +33,7 @@ if (WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
+            "${PROGRAMFILES_x86}/Windows Kits/8.1/Lib/winv6.3/um/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
-- 
cgit v1.2.3