From f0d1706907fca02580f58f60d2fb0dbb426e1b33 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 16 Jan 2020 15:25:25 +0000 Subject: [PATCH] Fix SDL2 compilation when path contains a space https://github.com/microsoft/vcpkg/blob/master/ports/sdl2/fix-space-in-path.patch Hope this gets fixed upstream. This is a dumb bug. --- external/SDL2/CMakeLists.txt | 2 +- external/SDL2/cmake/sdlchecks.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/SDL2/CMakeLists.txt b/external/SDL2/CMakeLists.txt index 4c0f6fd0..8a8ab4d6 100644 --- a/external/SDL2/CMakeLists.txt +++ b/external/SDL2/CMakeLists.txt @@ -257,7 +257,7 @@ add_definitions(-DUSING_GENERATED_CONFIG_H) # General includes include_directories(${SDL2_BINARY_DIR}/include ${SDL2_SOURCE_DIR}/include) if(USE_GCC OR USE_CLANG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter ${SDL2_SOURCE_DIR}/src/video/khronos") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -idirafter \"${SDL2_SOURCE_DIR}/src/video/khronos\"") else() include_directories(${SDL2_SOURCE_DIR}/src/video/khronos) endif() diff --git a/external/SDL2/cmake/sdlchecks.cmake b/external/SDL2/cmake/sdlchecks.cmake index 5d4d2f93..77e40122 100644 --- a/external/SDL2/cmake/sdlchecks.cmake +++ b/external/SDL2/cmake/sdlchecks.cmake @@ -1086,7 +1086,7 @@ macro(CheckHIDAPI) set(HAVE_SDL_JOYSTICK TRUE) file(GLOB HIDAPI_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c) set(SOURCE_FILES ${SOURCE_FILES} ${HIDAPI_SOURCES}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS} -I${SDL2_SOURCE_DIR}/src/hidapi/hidapi") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS} \"-I${SDL2_SOURCE_DIR}/src/hidapi/hidapi\"") if(NOT HIDAPI_SKIP_LIBUSB) set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/hidapi/libusb/hid.c) list(APPEND EXTRA_LIBS ${LIBUSB_LIBS})