Parcourir la source

Disable all camera drivers if SDL_CAMERA_DISABLED is defined

Fixes https://github.com/libsdl-org/SDL/issues/12182
Sam Lantinga il y a 1 mois
Parent
commit
e50db698e2
2 fichiers modifiés avec 11 ajouts et 2 suppressions
  1. 11 0
      src/SDL_internal.h
  2. 0 2
      src/camera/SDL_camera.c

+ 11 - 0
src/SDL_internal.h

@@ -203,6 +203,17 @@
 #define SDL_HAVE_YUV 1
 #endif
 
+#ifdef SDL_CAMERA_DISABLED
+#undef SDL_CAMERA_DRIVER_ANDROID
+#undef SDL_CAMERA_DRIVER_COREMEDIA
+#undef SDL_CAMERA_DRIVER_DUMMY
+#undef SDL_CAMERA_DRIVER_EMSCRIPTEN
+#undef SDL_CAMERA_DRIVER_MEDIAFOUNDATION
+#undef SDL_CAMERA_DRIVER_PIPEWIRE
+#undef SDL_CAMERA_DRIVER_V4L2
+#undef SDL_CAMERA_DRIVER_VITA
+#endif
+
 #ifdef SDL_RENDER_DISABLED
 #undef SDL_VIDEO_RENDER_SW
 #undef SDL_VIDEO_RENDER_D3D

+ 0 - 2
src/camera/SDL_camera.c

@@ -32,7 +32,6 @@
 
 // Available camera drivers
 static const CameraBootStrap *const bootstrap[] = {
-#ifndef SDL_CAMERA_DISABLED
 #ifdef SDL_CAMERA_DRIVER_V4L2
     &V4L2_bootstrap,
 #endif
@@ -56,7 +55,6 @@ static const CameraBootStrap *const bootstrap[] = {
 #endif
 #ifdef SDL_CAMERA_DRIVER_DUMMY
     &DUMMYCAMERA_bootstrap,
-#endif
 #endif
     NULL
 };