Dont put the launcher source files in the root directory
This commit is contained in:
parent
3cb572b47a
commit
deb8c3dacd
2
.gitignore
vendored
2
.gitignore
vendored
@ -10,7 +10,7 @@
|
|||||||
/compile_commands.json
|
/compile_commands.json
|
||||||
/link_commands.json
|
/link_commands.json
|
||||||
/glad/out/
|
/glad/out/
|
||||||
/kitty/launcher/
|
/kitty/launcher/kitty
|
||||||
/*.dSYM/
|
/*.dSYM/
|
||||||
__pycache__/
|
__pycache__/
|
||||||
/glfw/wayland-*-client-protocol.[ch]
|
/glfw/wayland-*-client-protocol.[ch]
|
||||||
|
|||||||
6
setup.py
6
setup.py
@ -904,8 +904,8 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
|
|||||||
os.makedirs(launcher_dir, exist_ok=True)
|
os.makedirs(launcher_dir, exist_ok=True)
|
||||||
os.makedirs(build_dir, exist_ok=True)
|
os.makedirs(build_dir, exist_ok=True)
|
||||||
objects = []
|
objects = []
|
||||||
for src in ('launcher.c', 'prewarm-launcher.c'):
|
for src in ('kitty/launcher/launcher.c', 'kitty/launcher/prewarm-launcher.c'):
|
||||||
obj = os.path.join(build_dir, src.replace('.c', '.o'))
|
obj = os.path.join(build_dir, src.replace('/', '-').replace('.c', '.o'))
|
||||||
objects.append(obj)
|
objects.append(obj)
|
||||||
cmd = env.cc + cppflags + cflags + ['-c', src, '-o', obj]
|
cmd = env.cc + cppflags + cflags + ['-c', src, '-o', obj]
|
||||||
key = CompileKey(src, os.path.basename(obj))
|
key = CompileKey(src, os.path.basename(obj))
|
||||||
@ -1365,7 +1365,7 @@ def clean() -> None:
|
|||||||
safe_remove(
|
safe_remove(
|
||||||
'build', 'compile_commands.json', 'link_commands.json',
|
'build', 'compile_commands.json', 'link_commands.json',
|
||||||
'linux-package', 'kitty.app', 'asan-launcher',
|
'linux-package', 'kitty.app', 'asan-launcher',
|
||||||
'kitty-profile', 'kitty/launcher')
|
'kitty-profile', 'kitty/launcher/kitty')
|
||||||
|
|
||||||
def excluded(root: str, d: str) -> bool:
|
def excluded(root: str, d: str) -> bool:
|
||||||
q = os.path.relpath(os.path.join(root, d), base).replace(os.sep, '/')
|
q = os.path.relpath(os.path.join(root, d), base).replace(os.sep, '/')
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user