TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

windows and linux AL_ALEXT_PROTOTYPES blocks, as well as exposed the defining of it cmake side for the adventurous (windows and linux on by default, mac off till we sort why dylibs are freaking out)

Browse source
This commit is contained in:
AzaezelX 2019-05-24 14:12:04 -05:00
parent 95b3f2146c
commit 4ed3d11534
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/sfx/openal/linux/LoadOAL.linux.cpp
View file

@ -447,6 +447,7 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable
warn("Failed to retrieve 'alcGetEnumValue' function address\n");
return AL_FALSE;
}
#if defined(AL_ALEXT_PROTOTYPES)
//efx
lpOALFnTable->alGenEffects = (LPALGENEFFECTS)dlsym(openal_library, "alGenEffects");
if (lpOALFnTable->alGenEffects == NULL)
@ -586,7 +587,7 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable
warn("Failed to retrieve 'alSource3i' function address\n");
return AL_FALSE;
}
#endif
return AL_TRUE;
}

4
Engine/source/sfx/openal/win32/LoadOAL.cpp
View file

@ -439,6 +439,7 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable
OutputDebugStringA("Failed to retrieve 'alcGetEnumValue' function address\n");
return AL_FALSE;
}
#if defined(AL_ALEXT_PROTOTYPES)
lpOALFnTable->alGenEffects = (LPALGENEFFECTS)GetProcAddress(g_hOpenALDLL, "alGenEffects");
if (lpOALFnTable->alGenEffects == NULL)
{
@ -551,6 +552,7 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable
OutputDebugStringA("Failed to retrieve 'alGetAuxiliaryEffectSlotiv' function address\n");
}
lpOALFnTable->alSource3i = (LPALSOURCE3I)GetProcAddress(g_hOpenALDLL, "alSource3i");
#endif
return AL_TRUE;
}
@ -562,4 +564,4 @@ ALvoid UnloadOAL10Library()
FreeLibrary(g_hOpenALDLL);
g_hOpenALDLL = NULL;
}
}
}

8
Tools/CMake/torque3d.cmake
View file

@ -394,18 +394,26 @@ endif()
if(TORQUE_SFX_OPENAL AND NOT TORQUE_DEDICATED)
addPath("${srcDir}/sfx/openal")
if(WIN32)
option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" ON)
addPath("${srcDir}/sfx/openal/win32")
addInclude("${libDir}/openal-soft/include")
endif()
if(UNIX AND NOT APPLE)
option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" ON)
addPath("${srcDir}/sfx/openal/linux")
endif()
if(APPLE)
option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" OFF)
addPath("${srcDir}/sfx/openal/mac")
addFramework("OpenAL")
endif()
endif()
mark_as_advanced(AL_ALEXT_PROTOTYPES)
if(AL_ALEXT_PROTOTYPES)
addDef( "AL_ALEXT_PROTOTYPES" )
endif()
# Vorbis
if(TORQUE_SFX_VORBIS)
addInclude(${libDir}/libvorbis/include)