Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fix gstrings accidentally being inserted into intellisense path (#9014)

Browse Source 
JSON conversion does not handle this correctly, and errors when
generating intellisense configs
This commit is contained in:
Thad House
2026-06-23 06:18:54 -07:00
committed by GitHub
parent dce911116a
commit e3cbc5eb30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glass/build.gradle
View File

@@ -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())
}
}
}