mirror of
https://github.com/love2d/love.git
synced 2026-08-12 08:30:56 +02:00
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:
@@ -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
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user