mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-13 17:30:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #678 from blingu/master

Browse source 
added support for FreeBSD
This commit is contained in:
erorcun 2020-08-08 14:58:42 +03:00 • committed by GitHub
commit 8428b99c0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/audio/sampman_oal.cpp
View file

@ -587,16 +587,16 @@ cSampleManager::Initialise(void)
}
nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] = (uintptr)malloc(nSampleBankSize[SAMPLEBANK_MAIN]);
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] != NULL);
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] != 0);
if ( nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] == NULL )
if ( nSampleBankMemoryStartAddress[SAMPLEBANK_MAIN] == 0 )
{
Terminate();
return false;
}
nSampleBankMemoryStartAddress[SAMPLEBANK_PED] = (uintptr)malloc(PED_BLOCKSIZE*MAX_PEDSFX);
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != NULL);
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != 0);
}

11
src/core/CdStreamPosix.cpp
View file

@ -150,9 +150,11 @@ CdStreamInit(int32 numChannels)
ASSERT(0);
return;
}
#ifdef __linux__
_gdwCdStreamFlags = O_RDONLY | O_NOATIME;
#else
_gdwCdStreamFlags = O_RDONLY;
#endif
// People say it's slower
/*
if ( fsInfo.f_bsize <= CDSTREAM_SECTOR_SIZE )
@ -400,9 +402,12 @@ void *CdStreamThread(void *param)
if (gCdStreamThreadStatus == 0){
gCdStreamThreadStatus = 1;
#endif
#ifdef __linux__
pid_t tid = syscall(SYS_gettid);
int ret = setpriority(PRIO_PROCESS, tid, getpriority(PRIO_PROCESS, getpid()) + 1);
}
#endif
}
// spurious wakeup or we sent interrupt signal for flushing
if(pChannel->nSectorsToRead == 0)

4
src/skel/glfw/glfw.cpp
View file

@ -209,7 +209,11 @@ double
psTimer(void)
{
struct timespec start;
#ifdef __linux__
clock_gettime(CLOCK_MONOTONIC_RAW, &start);
#else
clock_gettime(CLOCK_MONOTONIC, &start);
#endif
return start.tv_sec * 1000.0 + start.tv_nsec/1000000.0;
}
#endif