Skip to content

fix: android startup #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mehah merged 11 commits into from
Jul 6, 2025
Merged

fix: android startup #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f7581a
Update CMakeLists.txt
SkullzOTS Jul 4, 2025
0f685ab
Update androidgameactivity.cpp
SkullzOTS Jul 4, 2025
fd8826d
Update build.gradle
SkullzOTS Jul 4, 2025
fcd3620
Update CMakeLists.txt
SkullzOTS Jul 4, 2025
62cb34b
revert CMakeLists.txt
SkullzOTS Jul 4, 2025
6f8726b
build test
SkullzOTS Jul 5, 2025
b169aa3
Update CMakeLists.txt
SkullzOTS Jul 5, 2025
b261683
Update CMakeLists.txt
SkullzOTS Jul 5, 2025
2548512
Update CMakeLists.txt
SkullzOTS Jul 5, 2025
d6dbc83
Update CMakeLists.txt
SkullzOTS Jul 5, 2025
ea85440
Update CMakeLists.txt
SkullzOTS Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ android {
dependencies {
implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.games:games-activity:4.0.0'
implementation 'androidx.games:games-activity:1.2.1'
implementation 'com.google.android.material:material:1.12.0'
}
5 changes: 5 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ if(MSVC)
log_option_enabled("STATIC_LIBRARY")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
find_package(Vorbis REQUIRED)
if(ANDROID)
find_package(Vorbis CONFIG REQUIRED)
endif()
set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "")
else()
Expand Down Expand Up @@ -550,6 +553,8 @@ elseif(ANDROID)
Threads::Threads
asio::asio
OpenSLES
Vorbis::vorbis
Vorbis::vorbisfile
LibLZMA::LibLZMA
game-activity::game-activity
GLESv3
Expand Down
6 changes: 3 additions & 3 deletions src/framework/platform/androidgameactivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifdef ANDROID

#include <game-activity/GameActivity.h>
#include <game-text-input/gametextinput.h>
#include <game-activity/GameActivity.cpp>
#include <game-text-input/gametextinput.cpp>
extern "C" {
#include <game-activity/native_app_glue/android_native_app_glue.h>
#include <game-activity/native_app_glue/android_native_app_glue.c>
}

#endif
Loading