shithub: cstory

Info  •  Files  •  Log  •  Branches

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.

--- a/external/SDL2/CMakeLists.txt

+++ b/external/SDL2/CMakeLists.txt

@@ -257,7 +257,7 @@

 # 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()

--- a/external/SDL2/cmake/sdlchecks.cmake

+++ b/external/SDL2/cmake/sdlchecks.cmake

@@ -1086,7 +1086,7 @@

       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})