From bc569d8612c4e22924b85576f21e25fc52a4abe8 Mon Sep 17 00:00:00 2001 From: Egor Date: Sat, 10 Feb 2018 20:57:27 -0800 Subject: Fixed Android build --- unityplugin/GhostCubeScene/CMakeLists.txt | 6 ++-- .../GhostCubeScene/src/Android/AndroidMain.cpp | 36 ---------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 unityplugin/GhostCubeScene/src/Android/AndroidMain.cpp (limited to 'unityplugin/GhostCubeScene') diff --git a/unityplugin/GhostCubeScene/CMakeLists.txt b/unityplugin/GhostCubeScene/CMakeLists.txt index 51b0b23..412b2ec 100644 --- a/unityplugin/GhostCubeScene/CMakeLists.txt +++ b/unityplugin/GhostCubeScene/CMakeLists.txt @@ -21,8 +21,6 @@ set_source_files_properties(${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None") if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) list(APPEND SOURCE src/GhostCubeSceneResTrsnHelper.cpp) list(APPEND INCLUDE src/GhostCubeSceneResTrsnHelper.h) -elseif(PLATFORM_ANDROID) - list(APPEND SOURCE src/Android/AndroidMain.cpp) endif() if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) @@ -77,8 +75,8 @@ if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) elseif(PLATFORM_ANDROID) - list(APPEND SOURCE src/Android/AndroidMain.cpp src/LoadPluginFunctions.cpp) - add_library(GhostCubeScene SHARED ${SOURCE} ${INCLUDE}) + list(APPEND SOURCE src/LoadPluginFunctions.cpp) + add_android_app(GhostCubeScene "${SOURCE}" "${INCLUDE}" "${ASSETS}") elseif(PLATFORM_LINUX) diff --git a/unityplugin/GhostCubeScene/src/Android/AndroidMain.cpp b/unityplugin/GhostCubeScene/src/Android/AndroidMain.cpp deleted file mode 100644 index c1cd6e5..0000000 --- a/unityplugin/GhostCubeScene/src/Android/AndroidMain.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2015-2018 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -// This header must be included, otherwise the linker will somehow fail to find android_main() -#include - -// Actual implementation of the android_main() -void android_main_impl( struct android_app* state ); - -// When a native library is being loaded, JNI loader looks for the android_main function. -// If the entry does not export that function, it will fail to load. So we have to define -// android_main() in every android native application -void android_main( android_app* state ) -{ - android_main_impl(state); -} -- cgit v1.2.3