Skip to content

Commit 748e530

Browse files
committed
switch to android-game-sdk-rs submodule at v4.0.0
bump from 2.0.2 to 4.0.0 Signed-off-by: William Casarin <jb55@jb55.com>
1 parent 03536b9 commit 748e530

File tree

2 files changed

+40
-24
lines changed

2 files changed

+40
-24
lines changed

android-activity/android-games-sdk

Submodule android-games-sdk updated 3227 files

android-activity/build.rs

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,64 @@
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";
4+
let activity_path = |src_inc, name| format!("android-games-sdk/game-activity/prefab-src/modules/game-activity/{src_inc}/game-activity/{name}");
5+
let textinput_path = |src_inc, name| format!("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/{src_inc}/game-text-input/{name}");
66

77
for f in [
8-
"GameActivity.h",
98
"GameActivity.cpp",
10-
"GameActivityEvents.h",
119
"GameActivityEvents.cpp",
10+
] {
11+
println!("cargo:rerun-if-changed={}", activity_path("src", f));
12+
}
13+
14+
for f in [
15+
"GameActivity.h",
16+
"GameActivityEvents.h",
1217
"GameActivityLog.h",
1318
] {
14-
println!("cargo:rerun-if-changed={activity_basepath}/game-activity/{f}");
19+
println!("cargo:rerun-if-changed={}", activity_path("include", f));
1520
}
21+
1622
cc::Build::new()
1723
.cpp(true)
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"))
24+
.include("android-games-sdk/src/common")
25+
.file("android-games-sdk/src/common/system_utils.cpp")
26+
.extra_warnings(false)
27+
.cpp_link_stdlib("c++_static")
28+
.compile("libgame_common.a");
29+
30+
println!("cargo:rerun-if-changed=android-games-sdk/src/common/system_utils.cpp");
31+
println!("cargo:rerun-if-changed=android-games-sdk/src/common/system_utils.h");
32+
33+
cc::Build::new()
34+
.cpp(true)
35+
.include("android-games-sdk/src/common")
36+
.include("android-games-sdk/game-activity/prefab-src/modules/game-activity/include")
37+
.file(activity_path("src", "GameActivity.cpp"))
38+
.file(activity_path("src", "GameActivityEvents.cpp"))
2239
.extra_warnings(false)
2340
.cpp_link_stdlib("c++_static")
2441
.compile("libgame_activity.a");
2542

26-
for f in ["gamecommon.h", "gametextinput.h", "gametextinput.cpp"] {
27-
println!("cargo:rerun-if-changed={textinput_basepath}/game-text-input/{f}");
28-
}
43+
println!("cargo:rerun-if-changed={}", textinput_path("include", "gametextinput.h"));
44+
println!("cargo:rerun-if-changed={}", textinput_path("src", "gametextinput.cpp"));
45+
2946
cc::Build::new()
3047
.cpp(true)
31-
.include("android-games-sdk/include")
32-
.include(activity_basepath)
33-
.file(format!("{textinput_basepath}/game-text-input/gametextinput.cpp"))
48+
.include("android-games-sdk/src/common")
49+
.include("android-games-sdk/game-text-input/prefab-src/modules/game-text-input/include")
50+
.file(textinput_path("src", "gametextinput.cpp"))
3451
.cpp_link_stdlib("c++_static")
3552
.compile("libgame_text_input.a");
3653

37-
for f in ["android_native_app_glue.h", "android_native_app_glue.c"] {
38-
println!("cargo:rerun-if-changed={activity_basepath}/game-activity/native_app_glue/{f}");
39-
}
40-
54+
println!("cargo:rerun-if-changed={}", activity_path("src", "native_app_glue/android_native_app_glue.c"));
55+
println!("cargo:rerun-if-changed={}", activity_path("include", "native_app_glue/android_native_app_glue.h"));
56+
4157
cc::Build::new()
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"))
58+
.include("android-games-sdk/src/common")
59+
.include("android-games-sdk/game-activity/prefab-src/modules/game-activity/include")
60+
.include(activity_path("include", ""))
61+
.file(activity_path("src", "native_app_glue/android_native_app_glue.c"))
4662
.extra_warnings(false)
4763
.cpp_link_stdlib("c++_static")
4864
.compile("libnative_app_glue.a");

0 commit comments

Comments
 (0)