More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||
|
||||
#include "DeprecatedBindings.h"
|
||||
#undef TOLUA_TEMPLATE_BIND
|
||||
#include "tolua++/include/tolua++.h"
|
||||
|
||||
#include "Plugin.h"
|
||||
|
||||
@@ -11,6 +11,7 @@ extern "C"
|
||||
#include "lua/src/lualib.h"
|
||||
}
|
||||
|
||||
#undef TOLUA_TEMPLATE_BIND
|
||||
#include "tolua++/include/tolua++.h"
|
||||
#include "Bindings.h"
|
||||
#include "ManualBindings.h"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||
|
||||
#include "ManualBindings.h"
|
||||
#undef TOLUA_TEMPLATE_BIND
|
||||
#include "tolua++/include/tolua++.h"
|
||||
|
||||
#include "Plugin.h"
|
||||
|
||||
@@ -5,4 +5,4 @@ class ManualBindings
|
||||
{
|
||||
public:
|
||||
static void Bind( lua_State* tolua_S );
|
||||
};
|
||||
};
|
||||
|
||||
@@ -5,7 +5,11 @@
|
||||
|
||||
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define LUA_USE_MACOSX
|
||||
#else
|
||||
#define LUA_USE_POSIX
|
||||
#endif
|
||||
#include "PluginLua.h"
|
||||
#include "../CommandOutput.h"
|
||||
|
||||
@@ -14,6 +18,7 @@ extern "C"
|
||||
#include "lua/src/lualib.h"
|
||||
}
|
||||
|
||||
#undef TOLUA_TEMPLATE_BIND
|
||||
#include "tolua++/include/tolua++.h"
|
||||
|
||||
|
||||
|
||||
@@ -110,4 +110,4 @@ AString cWebPlugin::SafeString( const AString & a_String )
|
||||
RetVal.push_back( c );
|
||||
}
|
||||
return RetVal;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user