From 318c1f63a59520ff94b05ec191e6cc3e8abaf273 Mon Sep 17 00:00:00 2001 From: Li Linfeng Date: Tue, 31 Mar 2020 12:49:11 +0800 Subject: [PATCH] gl init --- app/src/main/cpp/CMakeLists.txt | 1 + app/src/main/cpp/dependency | 2 +- app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index fe7830d4..f9602eb1 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -412,6 +412,7 @@ add_definitions(-DNO_TTF) add_definitions(-DENABLE_NLS) add_definitions(-DUSE_SPICE) add_definitions(-DEIGEN_NO_DEBUG) +add_definitions(-DNO_GL_INIT) include_directories( ${CMAKE_SOURCE_DIR} diff --git a/app/src/main/cpp/dependency b/app/src/main/cpp/dependency index a12954d9..9e7d2078 160000 --- a/app/src/main/cpp/dependency +++ b/app/src/main/cpp/dependency @@ -1 +1 @@ -Subproject commit a12954d927a783397a948ce3e314bf83692850a0 +Subproject commit 9e7d207856007b95879964200bae274e38ad0b12 diff --git a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt index 98eae5ce..4ab5df63 100644 --- a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt +++ b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt @@ -413,6 +413,7 @@ class MainActivity : AppCompatActivity(), AppStatusReporter.shared().updateStatus("Loading library...") GlobalScope.launch(Dispatchers.IO) { System.loadLibrary("celestia") + CelestiaAppCore.initGL() withContext(Dispatchers.Main) { loadLibrarySuccess() }