archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Ton forgot a few modifications to the Scons and Makefile build systems.

Browse Source 
These should make it so that other people can compile with OpenEXR support.

(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)

Kent
This commit is contained in:
Kent Mein
2006-01-09 02:18:11 +00:00
parent 014aa7261e
commit c693e01b8d
6 changed files with 93 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/SoundSystem/openal/SND_OpenALDevice.cpp
View File

@@ -231,7 +231,7 @@ SND_OpenALDevice::SND_OpenALDevice()
m_context = alcCreateContext(dev, NULL);
if (m_context) {
alcMakeContextCurrent(m_context);
alcMakeContextCurrent((ALCcontext*)m_context);
m_audio = true;
m_device = dev;
#ifdef __linux__
@@ -339,7 +339,7 @@ SND_OpenALDevice::~SND_OpenALDevice()
if (m_context) {
MakeCurrent();
alcDestroyContext(m_context);
alcDestroyContext((ALCcontext*)m_context);
m_context = NULL;
}
@@ -410,7 +410,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
waveslot->SetFileSize(size);
/* what was (our) buffer? */
int buffer = waveslot->GetBuffer();
buffer = waveslot->GetBuffer();
/* get some info out of the sample */
SND_GetSampleInfo((signed char*)memlocation, waveslot);
@@ -419,9 +419,9 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
/* load the sample into openal */
#if defined(OUDE_OPENAL) || defined (__APPLE__)
alutLoadWAVMemory((char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate); // openal_2.12
alutLoadWAVMemory((ALbyte *)memlocation, &sampleformat, &data, &numberofsamples, &samplerate); // openal_2.12
#else
alutLoadWAVMemory((signed char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);// openal_2.14+
alutLoadWAVMemory((ALbyte *)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);// openal_2.14+
#endif
/* put it in the buffer */
alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate);