CMakeLists.txt
changeset 12258 231245d461a2
parent 12257 d7a3aac08fc1
child 12355 a46837d71c0a
     1.1 --- a/CMakeLists.txt	Fri Sep 28 21:03:39 2018 -0700
     1.2 +++ b/CMakeLists.txt	Fri Sep 28 21:19:27 2018 -0700
     1.3 @@ -1565,7 +1565,7 @@
     1.4  # This leads to missing internal references on building, since the
     1.5  # src/X/*.c does not get included.
     1.6  if(NOT HAVE_SDL_JOYSTICK)
     1.7 -  set(SDL_JOYSTICK_DISABLED 1)
     1.8 +  set(SDL_JOYSTICK_DUMMY 1)
     1.9    if(SDL_JOYSTICK AND NOT APPLE) # results in unresolved symbols on OSX
    1.10  
    1.11      file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/dummy/*.c)
    1.12 @@ -1573,10 +1573,15 @@
    1.13    endif()
    1.14  endif()
    1.15  if(NOT HAVE_SDL_HAPTIC)
    1.16 -  set(SDL_HAPTIC_DISABLED 1)
    1.17 +  set(SDL_HAPTIC_DUMMY 1)
    1.18    file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/dummy/*.c)
    1.19    set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES})
    1.20  endif()
    1.21 +if(NOT HAVE_SDL_SENSORS)
    1.22 +  set(SDL_SENSOR_DUMMY 1)
    1.23 +  file(GLOB SENSORS_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/dummy/*.c)
    1.24 +  set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
    1.25 +endif()
    1.26  if(NOT HAVE_SDL_LOADSO)
    1.27    set(SDL_LOADSO_DISABLED 1)
    1.28    file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c)
    1.29 @@ -1587,11 +1592,6 @@
    1.30    file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/dummy/*.c)
    1.31    set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
    1.32  endif()
    1.33 -if(NOT HAVE_SDL_SENSORS)
    1.34 -  set(SDL_SENSOR_DISABLED 1)
    1.35 -  file(GLOB SENSORS_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/dummy/*.c)
    1.36 -  set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
    1.37 -endif()
    1.38  
    1.39  # We always need to have threads and timers around
    1.40  if(NOT HAVE_SDL_THREADS)