zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-28 22:52:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

take 2

Browse source
This commit is contained in:
alexey.lysiuk 2022-12-30 13:25:09 +02:00
parent cfaa34e7ef
commit c4ef49a41f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aedi/target/base.py
View file

@ -114,7 +114,7 @@ class BuildTarget(Target):
if cxx_compiler := state.cxx_compiler():
env['CXX'] = str(cxx_compiler)
for prefix in ('AR', 'C', 'CPP', 'CXX', 'OBJC', 'OBJCXX'):
for prefix in ('C', 'CPP', 'CXX', 'OBJC', 'OBJCXX'):
state.update_environment(f'{prefix}FLAGS', f'-I{state.include_path}')
state.update_environment('LDFLAGS', f'-L{state.lib_path}')

3
aedi/target/library_tier1.py
View file

@ -516,7 +516,8 @@ class QuasiGlibTarget(BuildTarget):
os.makedirs(lib_path, exist_ok=True)
commands = (
(state.cxx_compiler(), '-std=c++11', '-O3', '-c', state.patch_path / f'{self.name}.cpp'),
[state.cxx_compiler(), '-std=c++11', '-O3', '-c', state.patch_path / f'{self.name}.cpp']
+ shlex.split(state.environment['CXXFLAGS']),
(state.host() + '-ar', '-crs', lib_path / f'lib{self.name}.a', f'{self.name}.o'),
)