diff --git a/CMakeLists.txt b/CMakeLists.txt index f40062aa36..f34e2370a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1513,12 +1513,10 @@ elseif(OHOS) set(SDL_VIDEO_DRIVER_OHOS 1) sdl_glob_sources("${SDL3_SOURCE_DIR}/src/video/ohos/*.c") set(HAVE_SDL_VIDEO TRUE) - set(SDL_VULKAN ON) set(HAVE_VULKAN ON) set(SDL_VIDEO_VULKAN ON) set(SDL_VIDEO_RENDER_VULKAN 1) set(HAVE_RENDER_VULKAN TRUE) - add_definitions(-DVK_USE_PLATFORM_OHOS=1) if(SDL_OPENGLES) set(SDL_VIDEO_OPENGL_EGL 1) diff --git a/ohos-project b/ohos-project deleted file mode 160000 index d48a2eedef..0000000000 --- a/ohos-project +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d48a2eedefe303910a84f74847594fe03f691dad diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 06ce3c8af9..453a600730 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -107,6 +107,9 @@ static VideoBootStrap *bootstrap[] = { #ifdef SDL_VIDEO_DRIVER_ANDROID &Android_bootstrap, #endif +#ifdef SDL_VIDEO_DRIVER_OHOS + &OHOS_bootstrap, +#endif #ifdef SDL_VIDEO_DRIVER_PS2 &PS2_bootstrap, #endif @@ -148,9 +151,6 @@ static VideoBootStrap *bootstrap[] = { #endif #ifdef SDL_VIDEO_DRIVER_OPENVR &OPENVR_bootstrap, -#endif -#ifdef SDL_VIDEO_DRIVER_OHOS - &OHOS_bootstrap, #endif NULL };