Skip to content

Commit

Permalink
More mactest
Browse files Browse the repository at this point in the history
  • Loading branch information
tbttfox committed Sep 13, 2024
1 parent b580f23 commit 1cfeb21
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ jobs:
maya: [2024, 2025]
include:
# Add the maya update versions here
- maya: 2022
update: 5
- maya: 2023
update: 3
- maya: 2024
update: 2
- maya: 2025
Expand Down
16 changes: 13 additions & 3 deletions subprojects/maya/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,23 @@ elif os_name == 'darwin'
maya_compile_args += ['-DOSMac_']
if meson.get_compiler('cpp').get_id() == 'clang'
maya_compile_args += ['--stdlib', 'libc++']
maya_compile_args += ['-arch', 'x86_64']
maya_link_args += ['-arch', 'x86_64']
if maya_version.version_compare('>=2024')
# clang will build for both x86 and arm
# if both arches are in the command line args
maya_compile_args += ['-arch', 'arm64']
maya_link_args += ['-arch', 'arm64']
else
maya_compile_args += ['-arch', 'x86_64']
maya_link_args += ['-arch', 'x86_64']
endif
# Just shut up the clang errors that don't show up in gcc or cl
# so I can see what's *really* going on
maya_compile_args += [
'-Wno-delete-non-abstract-non-virtual-dtor',
'-Wno-deprecated-declarations',
'-Wno-reorder-ctor',
'-Wno-unused-variable',
]

endif

# ignore this warning that comes from maya's headers
Expand Down

0 comments on commit 1cfeb21

Please sign in to comment.