libs: also disable SDL2 VIDEO_WAYLAND flag

This commit is contained in:
Remy Marquis 2020-03-20 15:01:14 +01:00
parent 2e46ad0c09
commit 53af5fd861

View file

@ -555,7 +555,7 @@ if(BUNDLED_SDL AND BUILD_CLIENT)
BINARY_DIR ${LIBS_BINARYDIR_DIR}/sdl2
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-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 -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF
-DRENDER_D3D=OFF -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF -DVIDEO_WAYLAND=OFF
-DSDL_SHARED=OFF -DFORCE_STATIC_VCRT=ON
-DCMAKE_INSTALL_PREFIX=${LIBS_BINARYDIR_DIR}/sdl2
PREFIX ${LIBS_BINARYDIR_DIR}/sdl2
@ -569,7 +569,7 @@ if(BUNDLED_SDL AND BUILD_CLIENT)
BINARY_DIR ${LIBS_BINARYDIR_DIR}/sdl2
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-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 -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF
-DRENDER_D3D=OFF -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF -DVIDEO_WAYLAND=OFF
-DSDL_SHARED=OFF -DFORCE_STATIC_VCRT=ON
-DCMAKE_INSTALL_PREFIX=${LIBS_BINARYDIR_DIR}/sdl2
PREFIX ${LIBS_BINARYDIR_DIR}/sdl2
@ -586,7 +586,7 @@ if(BUNDLED_SDL AND BUILD_CLIENT)
BUILD_BYPRODUCTS ${SDL32_BUNDLED_LIBRARIES}
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-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 -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF
-DRENDER_D3D=OFF -DRENDER_METAL=OFF -DVIDEO_DUMMY=OFF -DVIDEO_OPENGL=ON -DVIDEO_OPENGLES=${SDL_WITH_GLES} -DVIDEO_KMSDRM=OFF -DVIDEO_VULKAN=OFF -DVIDEO_METAL=OFF -DVIDEO_WAYLAND=OFF
-DSDL_SHARED=OFF -DFORCE_STATIC_VCRT=ON
-DCMAKE_INSTALL_PREFIX=${LIBS_BINARYDIR_DIR}/sdl2
PREFIX ${LIBS_BINARYDIR_DIR}/sdl2