OS X Builds now.
Fixed building on OS X. Fixed line endings. Need to find better way to do fmodwrapper thing.
This commit is contained in:
@@ -30,26 +30,30 @@
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
//Hack to build Darwin.
|
||||
//Need to find a better way to do this later.
|
||||
#define LL_FMOD
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#if LL_FMODEX
|
||||
#ifdef LL_FMODEX
|
||||
void FSOUND_Sound_Init(void);
|
||||
#endif
|
||||
#if LL_FMOD
|
||||
|
||||
#ifdef LL_FMOD
|
||||
void FSOUND_Init(void);
|
||||
#endif
|
||||
}
|
||||
|
||||
void* fmodwrapper(void)
|
||||
{
|
||||
{
|
||||
// When building the fmodwrapper library, the linker doesn't seem to want to bring in libfmod.a unless I explicitly
|
||||
// reference at least one symbol in the library. This seemed like the simplest way.
|
||||
void *ret = NULL;
|
||||
#if LL_FMODEX
|
||||
ret = (void*)&FSOUND_Sound_Init;
|
||||
#ifdef LL_FMODEX
|
||||
return (void*)&FSOUND_Sound_Init;
|
||||
#endif
|
||||
#if LL_FMOD
|
||||
ret = (void*)&FSOUND_Init;
|
||||
|
||||
#ifdef LL_FMOD
|
||||
return (void*)&FSOUND_Init;
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user