diff --git a/build-linux.sh b/build-linux.sh index 09761d9d..4f689813 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -1,3 +1,3 @@ #!/bin/bash -make -C build -j$(nproc) all \ No newline at end of file +make -C build -j$(nproc) config=release_x86 all \ No newline at end of file diff --git a/src/Common/Game/IW4/IW4_Assets.h b/src/Common/Game/IW4/IW4_Assets.h index 5c61fb0e..a6e787e2 100644 --- a/src/Common/Game/IW4/IW4_Assets.h +++ b/src/Common/Game/IW4/IW4_Assets.h @@ -613,7 +613,7 @@ namespace IW4 unsigned int loadBits[2]; }; - struct GfxDrawSurfFields + struct gcc_align(8) GfxDrawSurfFields { uint64_t objectId : 16; uint64_t reflectionProbeIndex : 8; @@ -630,8 +630,8 @@ namespace IW4 union GfxDrawSurf { - GfxDrawSurfFields fields; - uint64_t packed; + gcc_align(8) GfxDrawSurfFields fields; + gcc_align(8) uint64_t packed; }; struct MaterialInfo diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index e96c13cb..22c96c08 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -603,7 +603,7 @@ namespace T6 }; - struct GfxDrawSurfFields + struct gcc_align(8) GfxDrawSurfFields { uint64_t objectId : 16; uint64_t customIndex : 9; @@ -619,8 +619,8 @@ namespace T6 union GfxDrawSurf { - GfxDrawSurfFields fields; - uint64_t packed; + gcc_align(8) GfxDrawSurfFields fields; + gcc_align(8) uint64_t packed; }; @@ -1442,8 +1442,8 @@ namespace T6 GenericEventHandler* onEvent; ItemKeyHandler* onKey; ExpressionStatement visibleExp; - uint64_t showBits; - uint64_t hideBits; + gcc_align(8) uint64_t showBits; + gcc_align(8) uint64_t hideBits; const char* allowedBinding; const char* soundName; int imageTrack; @@ -3581,7 +3581,7 @@ namespace T6 }; - union __m128 + union gcc_align(8) __m128 { float m128_f32[4]; uint64_t m128_u64[2]; diff --git a/src/Common/Utils/TypeAlignment.h b/src/Common/Utils/TypeAlignment.h index 8b9b7b91..48cc7e75 100644 --- a/src/Common/Utils/TypeAlignment.h +++ b/src/Common/Utils/TypeAlignment.h @@ -24,7 +24,7 @@ #define gcc_align(x) #else #define type_align(x) __attribute__((__aligned__(x))) -#define tdef_align(x) __attribute__((__aligned__(x))) +#define tdef_align(x) /*__attribute__((__aligned__(x)))*/ #define memb_align(x) __attribute__((__aligned__(x))) #define gcc_align(x) __attribute__((__aligned__(x))) #endif