From e3cbc5eb305dda25b08578f7a38fe5f890d80a45 Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 23 Jun 2026 06:18:54 -0700 Subject: [PATCH] [build] Fix gstrings accidentally being inserted into intellisense path (#9014) JSON conversion does not handle this correctly, and errors when generating intellisense configs --- glass/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/glass/build.gradle b/glass/build.gradle index db3c337377..963d7eae63 100644 --- a/glass/build.gradle +++ b/glass/build.gradle @@ -100,9 +100,9 @@ model { } if (it.targetPlatform.operatingSystem.isWindows()) { - it.cppCompiler.args.add("/I${mrccommIncludeDir}") + it.cppCompiler.args.add("/I${mrccommIncludeDir}".toString()) } else { - it.cppCompiler.args.add("-I${mrccommIncludeDir}") + it.cppCompiler.args.add("-I${mrccommIncludeDir}".toString()) } lib project: ':wpimath', library: 'wpimath', linkage: 'shared' @@ -229,13 +229,13 @@ model { lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' if (it.targetPlatform.operatingSystem.isWindows()) { - it.cppCompiler.args.add("/I${mrccommIncludeDir}") + it.cppCompiler.args.add("/I${mrccommIncludeDir}".toString()) it.linker.args << 'kernel32.lib' << 'Gdi32.lib' << 'User32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' } else if (it.targetPlatform.operatingSystem.isMacOsX()) { - it.cppCompiler.args.add("-I${mrccommIncludeDir}") + it.cppCompiler.args.add("-I${mrccommIncludeDir}".toString()) it.linker.args << '-framework' << 'Metal' << '-framework' << 'MetalKit' << '-framework' << 'Cocoa' << '-framework' << 'IOKit' << '-framework' << 'CoreFoundation' << '-framework' << 'CoreVideo' << '-framework' << 'QuartzCore' } else { - it.cppCompiler.args.add("-I${mrccommIncludeDir}") + it.cppCompiler.args.add("-I${mrccommIncludeDir}".toString()) } } }