mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-02-18 01:21:47 +00:00
wip
[skip test]
This commit is contained in:
parent
bfea777b0f
commit
b94ce6e6e3
2 changed files with 21 additions and 21 deletions
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
|
@ -19,13 +19,13 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Build target
|
||||
run: |
|
||||
./build.py --target ${{ matrix.target }}
|
||||
|
||||
# - name: Generate Xcode project
|
||||
# - name: Build target
|
||||
# run: |
|
||||
# ./build.py --target ${{ matrix.target }} --xcode
|
||||
# ./build.py --target ${{ matrix.target }}
|
||||
|
||||
- name: Generate Xcode project
|
||||
run: |
|
||||
./build.py --target ${{ matrix.target }} --xcode
|
||||
|
||||
- name: List Build Directory
|
||||
if: always()
|
||||
|
|
|
@ -529,7 +529,7 @@ class MesonTarget(BuildTarget):
|
|||
args.append(f'--prefix={state.install_path}')
|
||||
|
||||
if state.xcode:
|
||||
args.append(f'--backend=xcode')
|
||||
args.append('--backend=xcode')
|
||||
else:
|
||||
cross_file_path = state.build_path / (state.architecture() + '.txt')
|
||||
self._write_cross_file(cross_file_path, state)
|
||||
|
@ -545,23 +545,23 @@ class MesonTarget(BuildTarget):
|
|||
if state.xcode:
|
||||
args = ('open', f'{self.name}.xcodeproj')
|
||||
subprocess.run(args, check=True, cwd=state.build_path, env=state.environment)
|
||||
else:
|
||||
# args = ['ninja']
|
||||
#
|
||||
# if state.verbose:
|
||||
# args.append('--verbose')
|
||||
#
|
||||
# subprocess.run(args, check=True, cwd=state.build_path, env=state.environment)
|
||||
|
||||
# args = ['ninja']
|
||||
#
|
||||
# if state.verbose:
|
||||
# args.append('--verbose')
|
||||
#
|
||||
# subprocess.run(args, check=True, cwd=state.build_path, env=state.environment)
|
||||
args = [
|
||||
'compile',
|
||||
f'-C={state.build_path}',
|
||||
]
|
||||
|
||||
args = [
|
||||
'compile',
|
||||
f'-C={state.build_path}',
|
||||
]
|
||||
if state.verbose:
|
||||
args.append('--verbose')
|
||||
|
||||
if state.verbose:
|
||||
args.append('--verbose')
|
||||
|
||||
self._run_meson(args, state)
|
||||
self._run_meson(args, state)
|
||||
|
||||
def post_build(self, state: BuildState):
|
||||
if state.xcode:
|
||||
|
|
Loading…
Reference in a new issue