admin/fs-build-variables
1
0
Fork 0
mirror of https://github.com/FirestormViewer/fs-build-variables.git synced 2026-08-14 00:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'universal' of https://github.com/secondlife/build-variables into universal

Browse Source 
# Conflicts:
#	variables
This commit is contained in:
Ansariel
2025-09-05 14:57:16 +02:00
parent b6ffddd72b 4087a21060
commit a9936a37f6
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions
+15
View File
@@ -161,3 +161,18 @@ function set_target {
fi
echo "${opts[*]}"
}
apply_patch()
{
local patch="$1"
local path="$2"
# Fix paths for windows
if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] ; then
patch="$(cygpath -m $patch)"
path="$(cygpath -m $path)"
fi
echo "Applying $patch..."
git apply --check --reverse --directory="$path" "$patch" || git apply --directory="$path" "$patch"
}
variables
+5 -6
View File
@@ -30,7 +30,7 @@ AUTOBUILD_SOURCE_ENVIRONMENT="Initialized"
LL_BUILD_WINDOWS_BASE_MACROS="/D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1"
# removed the /SAFESEH:NO /NODEFAULTLIB:LIBCMT altogether. Earlier solution of inserting /LINK switch
# earlier in the command line did not work for all projects. Removing switches entirely still works as expected.
LL_BUILD_WINDOWS_BASE_SWITCHES="/std:c++17 /Zc:wchar_t- /Zi /GR /DEBUG"
LL_BUILD_WINDOWS_BASE_SWITCHES="/std:c++20 /permissive- /Zc:wchar_t /Zi /GR /DEBUG"
LL_BUILD_WINDOWS_BASE="$LL_BUILD_WINDOWS_BASE_SWITCHES $LL_BUILD_WINDOWS_BASE_MACROS"
LL_BUILD_WINDOWS_RELEASE_MACROS="/DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG $LL_BUILD_WINDOWS_BASE_MACROS"
@@ -55,14 +55,13 @@ LL_BUILD_WINDOWS_DEBUG="$LL_BUILD_WINDOWS_DEBUG_SWITCHES $LL_BUILD_WINDOWS_DEBUG
LL_BUILD_WINDOWS_DEBUGOS="$LL_BUILD_WINDOWS_DEBUG"
# Mac and Linux common
LL_BUILD_POSIX_BASE_MACROS="-DLL_OS_DRAGDROP_ENABLED=1"
LL_BUILD_POSIX_BASE_SWITCHES="-std=c++17 -fPIC"
LL_BUILD_POSIX_BASE_MACROS="-DPIC -DLL_OS_DRAGDROP_ENABLED=1"
LL_BUILD_POSIX_BASE_SWITCHES="-std=c++20 -fPIC"
# Mac
LL_BUILD_DARWIN_DEPLOY_TARGET="11"
LL_BUILD_DARWIN_DISABLED_WARNINGS=""
LL_BUILD_DARWIN_BASE_MACROS="-DPIC -DLL_DARWIN=1 -DLIB_NDOF=1 -DCARES_STATICLIB $LL_BUILD_POSIX_BASE_MACROS"
LL_BUILD_DARWIN_BASE_SWITCHES="-gdwarf-2 -stdlib=libc++ -mmacosx-version-min=$LL_BUILD_DARWIN_DEPLOY_TARGET -iwithsysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/ $LL_BUILD_POSIX_BASE_SWITCHES $LL_BUILD_DARWIN_DISABLED_WARNINGS"
LL_BUILD_DARWIN_BASE_MACROS="-DLL_DARWIN=1 -DLIB_NDOF=1 $LL_BUILD_POSIX_BASE_MACROS"
LL_BUILD_DARWIN_BASE_SWITCHES="-g --debug -mmacosx-version-min=$LL_BUILD_DARWIN_DEPLOY_TARGET $LL_BUILD_POSIX_BASE_SWITCHES"
LL_BUILD_DARWIN_BASE="$LL_BUILD_DARWIN_BASE_SWITCHES $LL_BUILD_DARWIN_BASE_MACROS"
LL_BUILD_DARWIN_RELEASE_MACROS="-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG $LL_BUILD_DARWIN_BASE_MACROS"