Merge pull request #538 from r-a-sattarov/master

tiny improvements and fixes
This commit is contained in:
Robert Beckebans 2021-03-15 21:14:42 +01:00 committed by GitHub
commit 4f55ec094d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -3653,7 +3653,7 @@ cm_model_t* idCollisionModelManagerLocal::LoadBinaryModelFromFile( idFile* file,
assert( model->polygonRefBlocks == NULL || ( model->polygonRefBlocks->next == NULL && model->polygonRefBlocks->nextRef == NULL ) );
// RB: FIXME
#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__)
#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__) && !defined(__e2k__) && !defined(__aarch64__) && !(defined(__mips64) || defined(__mips64_))
assert( model->polygonBlock->bytesRemaining == 0 );
assert( model->brushBlock->bytesRemaining == 0 );
#endif

View file

@ -117,10 +117,14 @@ If you have questions concerning this license or the applicable additional terms
#define CPUSTRING "e2k"
#elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
#define CPUSTRING "aarch64"
#elif defined(__powerpc64__)
#elif defined(__powerpc64__) || defined(__PPC64__)
#define CPUSTRING "ppc64"
#elif defined(__mips64) || defined(__mips64_)
#define CPUSTRING "mips64"
#elif defined(__riscv__) || defined(__riscv)
#define CPUSTRING "riscv"
#elif defined(__sparc__) || defined(__sparc)
#define CPUSTRING "sparc"
#else
#error unknown CPU
#endif