Skip to content

Commit eda304e

Browse files
penninghlhdshiena
authored andcommitted
Squash godotengine#98416 and split Android camera
1 parent 19bb187 commit eda304e

File tree

12 files changed

+666
-2
lines changed

12 files changed

+666
-2
lines changed

modules/camera/SCsub

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Import("env_modules")
66

77
env_camera = env_modules.Clone()
88

9-
if env["platform"] in ["windows", "macos", "linuxbsd"]:
9+
if env["platform"] in ["windows", "macos", "linuxbsd", "android"]:
1010
env_camera.add_source_files(env.modules_sources, "register_types.cpp")
1111

1212
if env["platform"] == "windows":
@@ -15,6 +15,10 @@ if env["platform"] == "windows":
1515
elif env["platform"] == "macos":
1616
env_camera.add_source_files(env.modules_sources, "camera_macos.mm")
1717

18+
elif env["platform"] == "android":
19+
env_camera.add_source_files(env.modules_sources, "camera_android.cpp")
20+
env.Append(LIBS=["camera2ndk", "mediandk"])
21+
1822
elif env["platform"] == "linuxbsd":
1923
env_camera.add_source_files(env.modules_sources, "camera_linux.cpp")
2024
env_camera.add_source_files(env.modules_sources, "camera_feed_linux.cpp")

0 commit comments

Comments
 (0)