LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-12 08:31:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed build for latest love-android version

Browse Source
This commit is contained in:
fysx
2015-01-22 20:57:57 +01:00
parent 542c029666
commit d0f866e4b0
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/Android.mk
+1
View File
@@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \
$(wildcard ${LOCAL_PATH}/src/libraries/enet/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/enet/libenet/*.c) \
$(wildcard ${LOCAL_PATH}/src/libraries/luasocket/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/luautf8/*.c) \
$(wildcard ${LOCAL_PATH}/src/libraries/luasocket/libluasocket/*.c) \
$(wildcard ${LOCAL_PATH}/src/libraries/noise1234/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Wuff/*.c) \
jni/love/src/love.cpp
+10 -1
View File
@@ -18,8 +18,12 @@
* 3. This notice may not be removed or altered from any source distribution.
**/
#include "common/version.h"
#include "modules/love/love.h"
#ifndef LOVE_ANDROID
#include "common/version.h"
#endif
#include <SDL.h>
#ifdef LOVE_BUILD_EXE
@@ -195,12 +199,17 @@ int main(int argc, char **argv)
argv = hack_argv;
#endif // LOVE_LEGENDARY_APP_ARGV_HACK
#ifndef LOVE_ANDROID
// TODO: LOVE for Android creates a single library instead of executable
// and library. Therefore this check is not required, but causes a
// duplicate definition of the love::VERSION symbol.
if (strcmp(love::VERSION, love_version()) != 0)
{
printf("Version mismatch detected!\nLOVE binary is version %s\n"
"LOVE library is version %s\n", love::VERSION, love_version());
return 1;
}
#endif
// Oh, you just want the version? Okay!
if (argc > 1 && strcmp(argv[1], "--version") == 0)