livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up windows build error in GHA

master
Rye 2025-08-28 06:08:13 -04:00
parent 96ff5f8e70
commit 2b44464a14
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yaml vendored
View File

@ -64,7 +64,7 @@ jobs:
# autobuild-package.xml. # autobuild-package.xml.
AUTOBUILD_VCS_INFO: "true" AUTOBUILD_VCS_INFO: "true"
AUTOBUILD_VSVER: "170" AUTOBUILD_VSVER: "170"
DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer" DEVELOPER_DIR: "/Applications/Xcode_16.4.app/Contents/Developer"
# Ensure that Linden viewer builds engage Bugsplat. # Ensure that Linden viewer builds engage Bugsplat.
BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }} BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
build_coverity: false build_coverity: false
@ -98,7 +98,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: secondlife/build-variables repository: secondlife/build-variables
ref: master ref: universal
path: .build-variables path: .build-variables
- name: Checkout master-message-template - name: Checkout master-message-template

8
indra/CMakeLists.txt
View File

@ -10,7 +10,7 @@
## Nicky: Ideally we want at least 3.21 for good preset support ## Nicky: Ideally we want at least 3.21 for good preset support
## We're not there yet, but once done, there is a kludge in Linking.cmake ## We're not there yet, but once done, there is a kludge in Linking.cmake
# "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed # "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.16.0...4.0 FATAL_ERROR)
cmake_policy(SET CMP0156 NEW) cmake_policy(SET CMP0156 NEW)
cmake_policy(SET CMP0179 NEW) cmake_policy(SET CMP0179 NEW)
@ -35,7 +35,13 @@ if (NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
endif() endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # This slows down build massively
set(CMAKE_OPTIMIZE_DEPENDENCIES ON) set(CMAKE_OPTIMIZE_DEPENDENCIES ON)
set(CMAKE_COLOR_DIAGNOSTICS ON)
# Speeds up cmake generation significantly in some cases
set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON) set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON)
include(Variables) include(Variables)

2
indra/llcommon/llpreprocessor.h
View File

@ -181,7 +181,7 @@
#define LL_TO_STRING_HELPER(x) #x #define LL_TO_STRING_HELPER(x) #x
#define LL_TO_STRING(x) LL_TO_STRING_HELPER(x) #define LL_TO_STRING(x) LL_TO_STRING_HELPER(x)
#define LL_TO_WSTRING_HELPER(x) L#x #define LL_TO_WSTRING_HELPER(x) L## #x
#define LL_TO_WSTRING(x) LL_TO_WSTRING_HELPER(x) #define LL_TO_WSTRING(x) LL_TO_WSTRING_HELPER(x)
#define LL_FILE_LINENO_MSG(msg) __FILE__ "(" LL_TO_STRING(__LINE__) ") : " msg #define LL_FILE_LINENO_MSG(msg) __FILE__ "(" LL_TO_STRING(__LINE__) ") : " msg
#define LL_GLUE_IMPL(x, y) x##y #define LL_GLUE_IMPL(x, y) x##y