Skip to content

Commit

Permalink
t
Browse files Browse the repository at this point in the history
  • Loading branch information
mborgerson committed Jan 2, 2025
1 parent cbd6f0a commit 7ea9093
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion hw/xbox/nv2a/pgraph/thirdparty/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
nv2a_vsh_cpu_opts = cmake.subproject_options()
nv2a_vsh_cpu_opts.add_cmake_defines({'nv2a_vsh_cpu_UNIT_TEST': 'OFF'})
nv2a_vsh_cpu_opts.add_cmake_defines({
'CMAKE_OSX_ARCHITECTURES': cmake_arch,
'nv2a_vsh_cpu_UNIT_TEST': 'OFF',
})
nv2a_vsh_cpu_subproj = cmake.subproject('nv2a_vsh_cpu', options: nv2a_vsh_cpu_opts)
nv2a_vsh_cpu = declare_dependency(include_directories: nv2a_vsh_cpu_subproj.include_directories('nv2a_vsh_emulator'),
link_with: [
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ have_block = have_system or have_tools

python = import('python').find_installation()
cmake = import('cmake')
cmake_arch = host_machine.cpu() == 'aarch64' ? 'arm64' : 'x86_64'
cmake_arch = host_machine.cpu() == 'aarch64' ? 'arm64' : host_machine.cpu()

if cpu not in supported_cpus
host_arch = 'unknown'
Expand Down

0 comments on commit 7ea9093

Please sign in to comment.