Apply the love-experiment moduleselect branch

You can now:
	- Enable and disable love's modules, implementations and libraries using configure switches
	- Use pkg-config for a couple of love's requirements
	- Build on OSX
	- Use newer versions of FreeType2
	- Get a slightly better error message using automagic
This commit is contained in:
Bart van Strien
2013-12-08 19:32:32 +01:00
parent 2ee869b0e8
commit 3d82eecc08
9 changed files with 337 additions and 45 deletions
+4
View File
@@ -304,6 +304,7 @@ static const lua_CFunction types[] =
extern "C" int luaopen_love_audio(lua_State *L)
{
#ifdef LOVE_ENABLE_AUDIO_OPENAL
if (instance == 0)
{
// Try OpenAL first.
@@ -318,7 +319,9 @@ extern "C" int luaopen_love_audio(lua_State *L)
}
else
instance->retain();
#endif
#ifdef LOVE_ENABLE_AUDIO_NULL
if (instance == 0)
{
// Fall back to nullaudio.
@@ -331,6 +334,7 @@ extern "C" int luaopen_love_audio(lua_State *L)
std::cout << e.what() << std::endl;
}
}
#endif
if (instance == 0)
return luaL_error(L, "Could not open any audio module.");