From b99fcdb30ab65be55aefadaa187849525f189500 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev 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 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 From 64a78b8c7f82641ce58761432d04458f0ebea721 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 29 Jul 2020 13:52:24 -0700 Subject: Small change to CMake options to only enable the PreferredToolArchitecture=x64 option (required for 32bit TeamCity builds) on 32 bit builds generally - removes a ton of 'unknown option, ignored' spam in the build output --- indra/cmake/00-Common.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 865c057e33..fc0642bbed 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -63,7 +63,12 @@ if (WINDOWS) # Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit # compiler on our TeamCity build hosts has started running out of virtual # memory for the precompiled header file. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64") + # CP changed to only append the flag for 32bit builds - on 64bit builds, + # locally at least, the build output is spammed with 1000s of 'D9002' + # warnings about this switch being ignored. + if( ADDRESS_SIZE EQUAL 32 ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64") + endif() set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo" -- cgit v1.2.3 From 7a2237a3a6815676cdaf3929f7fe36ef2649281a Mon Sep 17 00:00:00 2001 From: Dave Houlton Date: Mon, 24 Aug 2020 15:58:04 -0600 Subject: DRTVWR-497 restore parallel builds for x64 VS2017 --- indra/cmake/00-Common.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index fc0642bbed..8aea50e02b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -66,8 +66,9 @@ if (WINDOWS) # CP changed to only append the flag for 32bit builds - on 64bit builds, # locally at least, the build output is spammed with 1000s of 'D9002' # warnings about this switch being ignored. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") if( ADDRESS_SIZE EQUAL 32 ) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64") endif() set(CMAKE_CXX_FLAGS_RELWITHDEBINFO -- cgit v1.2.3