build: fix Xbyak ODR violation and update related dependencies

mirror of https://github.com/citron-neo/emulator.git synced 2026-07-05 15:21:57 -07:00

- Fix a layout/ODR violation in Xbyak::CodeGenerator/LabelManager:
  In src/video_core/macro.cpp, replace the direct inclusion of
  <xbyak/xbyak.h> with "common/x64/xbyak_abi.h". This ensures the custom
  container macros (XBYAK_STD_UNORDERED_*) are defined before the Xbyak
  headers are parsed, preventing different translation units from
  instantiating mismatched template offsets (which led to vmovaps crashes).

- Update dynarmic submodule to c08207dd (latest master which updates
  its own external dependencies).

- Update matching dependency pins in dependencies.cmake and their
  corresponding submodules in externals/ to maintain ABI compatibility:
  - fmt: update to e8244777ee1c32df8233c215ac9ff626b2dd2c38
  - Catch2: update to 675f9eaeb191c51b9d2ffb2bb198009533895051
  - oaknut: update to 94c726ce0338b054eb8cb5ea91de8fe6c19f4392
  - xbyak: update to c506ecd5134122115a981fdd45c2a756f9ce20ac

This commit is contained in:

cheezwiz7899

2026-06-24 13:10:12 +10:00

committed by

Ploo

parent b44dad9a68

commit 757ee321b1

5 changed files with 630 additions and 4 deletions

dependencies.cmake

+626

View File

File diff suppressed because it is too large Load Diff

externals/dynarmic

Vendored

+1 -1

Submodule externals/dynarmic updated: bee46cba43...c08207ddec

externals/oaknut

Vendored

+1 -1

Submodule externals/oaknut updated: 9d091109de...94c726ce03

externals/xbyak

Vendored

+1 -1

Submodule externals/xbyak updated: 560ca67142...c506ecd513

									
										src/video_core/macro.cpp
									
		+1
		-1
	
												View File
												
				@@ -21,7 +21,7 @@

				#pragma clang diagnostic ignored "-Wconversion"

				#pragma clang diagnostic ignored "-Wshadow"

				#endif

				#include <xbyak/xbyak.h>

				#include "common/x64/xbyak_abi.h"

				#endif

				#include "common/assert.h"