From 08c64d2dfa17faa8815c87429abe230993c7c6d7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 4 Sep 2015 14:17:36 +0300 Subject: Fix wrong linkage on Android. --- src/main.cpp | 2 +- src/maingui.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3-60-g2f50