diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-09-04 14:17:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-09-04 14:17:36 +0300 |
| commit | 08c64d2dfa17faa8815c87429abe230993c7c6d7 (patch) | |
| tree | de0cdd0f3b2902072a61fd0a2c3c657ac77b9450 /src | |
| parent | 99042aa646d4895ed3736e7a955adcceaa7d7dbb (diff) | |
| download | manaplus-08c64d2dfa17faa8815c87429abe230993c7c6d7.tar.gz manaplus-08c64d2dfa17faa8815c87429abe230993c7c6d7.tar.bz2 manaplus-08c64d2dfa17faa8815c87429abe230993c7c6d7.tar.xz manaplus-08c64d2dfa17faa8815c87429abe230993c7c6d7.zip | |
Fix wrong linkage on Android.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/maingui.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index de2b1a7a1..081a76435 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ #endif #include "debug.h" -#ifndef UNITTESTS +#if !defined(UNITTESTS) && !defined(ANDROID) int main(int argc, char *argv[]) { return mainGui(argc, argv); diff --git a/src/maingui.cpp b/src/maingui.cpp index a59af6cc1..d3b7fe6c0 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -69,7 +69,11 @@ char *selfName = nullptr; #ifndef UNITTESTS +#ifdef ANDROID +int main(int argc, char *argv[]) +#else int mainGui(int argc, char *argv[]) +#endif { #if defined(__MINGW32__) // load mingw crash handler. Won't fail if dll is not present. |