Skip to content

Commit 03536b9

Browse files
committed
switch to android-game-sdk-rs submodule at v2.0.2
Also includes our patches on top (branch android-activity-2.0.2). This is mainly to test to make sure everything is still working. We will switch to the android-activity-4.0.0 branch when we're done Signed-off-by: William Casarin <jb55@jb55.com>
1 parent c324243 commit 03536b9

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "android-activity/game-activity-csrc"]
2+
path = android-activity/android-games-sdk
3+
url = https://github.com/jb55/android-games-sdk-rs

android-activity/android-games-sdk

Submodule android-games-sdk added at 5c6d742

android-activity/build.rs

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,48 @@
11
#![allow(dead_code)]
22

33
fn build_glue_for_game_activity() {
4+
let activity_basepath = "android-games-sdk/game-activity/prefab-src/modules/game-activity/include";
5+
let textinput_basepath = "android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include";
6+
47
for f in [
58
"GameActivity.h",
69
"GameActivity.cpp",
710
"GameActivityEvents.h",
811
"GameActivityEvents.cpp",
912
"GameActivityLog.h",
1013
] {
11-
println!("cargo:rerun-if-changed=game-activity-csrc/game-activity/{f}");
14+
println!("cargo:rerun-if-changed={activity_basepath}/game-activity/{f}");
1215
}
1316
cc::Build::new()
1417
.cpp(true)
15-
.include("game-activity-csrc")
16-
.file("game-activity-csrc/game-activity/GameActivity.cpp")
17-
.file("game-activity-csrc/game-activity/GameActivityEvents.cpp")
18+
.include("android-games-sdk/include")
19+
.include(activity_basepath)
20+
.file(format!("{activity_basepath}/game-activity/GameActivity.cpp"))
21+
.file(format!("{activity_basepath}/game-activity/GameActivityEvents.cpp"))
1822
.extra_warnings(false)
1923
.cpp_link_stdlib("c++_static")
2024
.compile("libgame_activity.a");
2125

2226
for f in ["gamecommon.h", "gametextinput.h", "gametextinput.cpp"] {
23-
println!("cargo:rerun-if-changed=game-activity-csrc/game-text-input/{f}");
27+
println!("cargo:rerun-if-changed={textinput_basepath}/game-text-input/{f}");
2428
}
2529
cc::Build::new()
2630
.cpp(true)
27-
.include("game-activity-csrc")
28-
.file("game-activity-csrc/game-text-input/gametextinput.cpp")
31+
.include("android-games-sdk/include")
32+
.include(activity_basepath)
33+
.file(format!("{textinput_basepath}/game-text-input/gametextinput.cpp"))
2934
.cpp_link_stdlib("c++_static")
3035
.compile("libgame_text_input.a");
3136

3237
for f in ["android_native_app_glue.h", "android_native_app_glue.c"] {
33-
println!("cargo:rerun-if-changed=game-activity-csrc/native_app_glue/{f}");
38+
println!("cargo:rerun-if-changed={activity_basepath}/game-activity/native_app_glue/{f}");
3439
}
40+
3541
cc::Build::new()
36-
.include("game-activity-csrc")
37-
.include("game-activity-csrc/game-activity/native_app_glue")
38-
.file("game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c")
42+
.include("android-games-sdk/include")
43+
.include(activity_basepath)
44+
.include(format!("{activity_basepath}/game-activity/native_app_glue"))
45+
.file(format!("{activity_basepath}/game-activity/native_app_glue/android_native_app_glue.c"))
3946
.extra_warnings(false)
4047
.cpp_link_stdlib("c++_static")
4148
.compile("libnative_app_glue.a");

0 commit comments

Comments
 (0)