Adjust version header to resolve linker conflict with two definitions of love::VERSION in android builds

NOTE: Sadly, on some platforms, like linux, the linker is "smart" enough to have the previous code be completely ineffective, the checking will only work with versions of love >= 0.9.2
This commit is contained in:
Bart van Strien
2015-01-24 23:09:49 +01:00
parent cf60cf89fc
commit 33d2331255
3 changed files with 7 additions and 4 deletions
+2 -1
View File
@@ -25,10 +25,11 @@ namespace love
{
// Version stuff.
#define LOVE_VERSION_STRING "0.9.2"
const int VERSION_MAJOR = 0;
const int VERSION_MINOR = 9;
const int VERSION_REV = 2;
const char *VERSION = "0.9.2";
const char *VERSION = LOVE_VERSION_STRING;
const char *VERSION_COMPATIBILITY[] = { VERSION, "0.9.1", "0.9.0", 0 };
const char *VERSION_CODENAME = "Baby Inspector";
+2 -2
View File
@@ -151,10 +151,10 @@ int main(int argc, char **argv)
argv = hack_argv;
#endif // LOVE_LEGENDARY_APP_ARGV_HACK
if (strcmp(love::VERSION, love_version()) != 0)
if (strcmp(LOVE_VERSION_STRING, love_version()) != 0)
{
printf("Version mismatch detected!\nLOVE binary is version %s\n"
"LOVE library is version %s\n", love::VERSION, love_version());
"LOVE library is version %s\n", LOVE_VERSION_STRING, love_version());
return 1;
}
+3 -1
View File
@@ -165,7 +165,9 @@ int w__openConsole(lua_State *L);
const char *love_version()
{
return love::VERSION;
// Do not refer to love::VERSION here, the linker
// will patch it back up to the executable's one..
return LOVE_VERSION_STRING;
}
const char *love_codename()