diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc881bc..722661af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -670,16 +670,19 @@ if(BUNDLED_SDL AND BUILD_CLIENT) -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_OSX_DEPLOYMENT_TARGET="${CMAKE_OSX_DEPLOYMENT_TARGET}" -DRENDER_D3D=OFF -DSDL_RENDER=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_VULKAN=OFF - -DVIDEO_KMSDRM=OFF -DVIDEO_X11_XINPUT=OFF + -DVIDEO_KMSDRM=OFF -DSDL_SHARED=OFF -DSNDIO=OFF -DHAVE_LIBC=ON -DCMAKE_INSTALL_PREFIX=${LIBS_BINARY_DIR}/sdl2) # Bye bye X11 if(APPLE) - set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_X11=OFF -DVIDEO_WAYLAND=OFF -DVIDEO_OPENGLES=OFF -DVIDEO_METAL=OFF -DVIDEO_COCOA=ON) - elseif(LINUX OR ARM) + set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_X11=OFF -DVIDEO_X11_XINPUT=OFF -DVIDEO_WAYLAND=OFF -DVIDEO_OPENGLES=OFF -DVIDEO_METAL=OFF -DVIDEO_COCOA=ON) + elseif(LINUX) # Wayland requires OpenglES support so that's why its enabled here. - set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_X11=ON -DVIDEO_WAYLAND=ON -DVIDEO_OPENGLES=ON) + set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_X11=ON -DVIDEO_X11_XINPUT=ON -DVIDEO_WAYLAND=ON -DVIDEO_OPENGLES=ON) + elseif(ARM) + # Wayland requires OpenglES support so that's why its enabled here. + set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_X11=ON -DVIDEO_X11_XINPUT=OFF -DVIDEO_WAYLAND=ON -DVIDEO_OPENGLES=ON) elseif(WIN32) set(SDL_CMAKE_ARGS ${SDL_CMAKE_ARGS} -DVIDEO_OPENGLES=${FEATURE_RENDERER_GLES} -DFORCE_STATIC_VCRT=ON) endif()