Use the slangc binary instead trying to get the C++ extension working everywhere is too fragile

This commit is contained in:
Kovid Goyal
2026-06-25 09:35:05 +05:30
parent bf75196de6
commit 050488c06a
6 changed files with 21 additions and 224 deletions

View File

@@ -630,22 +630,6 @@ def init_env(
return ans
def slang_env(args: Options) -> Env:
ans = env.copy()
cflags = []
for x in ans.cflags:
if x == '-Wstrict-prototypes':
continue
if x.startswith('-std='):
x = '-std=c++20'
cflags.append(x)
cflags[:0] = pkg_config('slang-compiler', '--cflags-only-I')
pylib = get_python_flags(args, cflags)
ans.cflags = cflags
ans.ldflags = ['-lstdc++'] + pylib + ans.ldflags + pkg_config('slang-compiler', '--libs')
return ans
def kitty_env(args: Options) -> Env:
ans = env.copy()
cflags = ans.cflags
@@ -1232,10 +1216,6 @@ def build(args: Options, native_optimizations: bool = True, call_init: bool = Tr
kitty_env(args), 'kitty/fast_data_types', args.compilation_database, sources, headers,
build_dsym=args.build_dsym,
)
sources, headers = ['kitty/shaders/compiler.cpp'], []
compile_c_extension(
slang_env(args), 'kitty/slangc', args.compilation_database, sources, headers, build_dsym=args.build_dsym
)
compile_glfw(args.compilation_database, args.build_dsym)
compile_kittens(args)
add_builtin_fonts(args)