seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108613 from Repiteo/scons/fix-defines

Browse Source 
SCons: Ensure `CPPDEFINES` is properly utilized
This commit is contained in:
Thaddeus Crews
2025-09-16 11:44:45 -05:00
parent 697474baad 61956f2e06
commit 4dec6af2c8
9 changed files with 80 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/vulkan/SCsub
View File

@ -34,7 +34,7 @@ env_thirdparty_vma.disable_warnings()
thirdparty_sources_vma = [thirdparty_dir + "/vk_mem_alloc.cpp"]
if env["use_volk"]:
env_thirdparty_vma.AppendUnique(CPPDEFINES=["VMA_STATIC_VULKAN_FUNCTIONS=1"])
env_thirdparty_vma.AppendUnique(CPPDEFINES=[("VMA_STATIC_VULKAN_FUNCTIONS", 1)])
env_thirdparty_volk = env.Clone()
env_thirdparty_volk.disable_warnings()
@ -43,10 +43,10 @@ if env["use_volk"]:
elif env["platform"] == "android":
# Our current NDK version only provides old Vulkan headers,
# so we have to limit VMA.
env_thirdparty_vma.AppendUnique(CPPDEFINES=["VMA_VULKAN_VERSION=1000000"])
env_thirdparty_vma.AppendUnique(CPPDEFINES=[("VMA_VULKAN_VERSION", 1000000)])
elif env["platform"] == "macos" or env["platform"] == "ios":
# MoltenVK supports only Vulkan 1.1 API, limit VMA to the same version.
env_thirdparty_vma.AppendUnique(CPPDEFINES=["VMA_VULKAN_VERSION=1001000"])
env_thirdparty_vma.AppendUnique(CPPDEFINES=[("VMA_VULKAN_VERSION", 1001000)])
env_thirdparty_vma.add_source_files(thirdparty_obj, thirdparty_sources_vma)