Skip to content
Permalink
Browse files

Mark a subsystem as dummy, not disabled, if it was intended to be com…

…piled in.

From Tom Black:

I'm having problems initializing the sensor module. I'm compiling with a standard ./configure && make && sudo make install, and the module says it's enabled, but SDL_Init(SDL_INIT_EVERYTHING) is failing with SDL_GetError() returning "SDL not built with sensor support".
  • Loading branch information
slouken committed Sep 29, 2018
1 parent 14d2ec8 commit c17d62996fbbaf1fd041c60c27471c387f63b0cf
Showing with 13 additions and 13 deletions.
  1. +7 −7 CMakeLists.txt
  2. +3 −3 configure
  3. +3 −3 configure.in
@@ -1565,18 +1565,23 @@ endif()
# This leads to missing internal references on building, since the
# src/X/*.c does not get included.
if(NOT HAVE_SDL_JOYSTICK)
set(SDL_JOYSTICK_DISABLED 1)
set(SDL_JOYSTICK_DUMMY 1)
if(SDL_JOYSTICK AND NOT APPLE) # results in unresolved symbols on OSX

file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${JOYSTICK_SOURCES})
endif()
endif()
if(NOT HAVE_SDL_HAPTIC)
set(SDL_HAPTIC_DISABLED 1)
set(SDL_HAPTIC_DUMMY 1)
file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES})
endif()
if(NOT HAVE_SDL_SENSORS)
set(SDL_SENSOR_DUMMY 1)
file(GLOB SENSORS_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
endif()
if(NOT HAVE_SDL_LOADSO)
set(SDL_LOADSO_DISABLED 1)
file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c)
@@ -1587,11 +1592,6 @@ if(NOT HAVE_SDL_FILESYSTEM)
file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
endif()
if(NOT HAVE_SDL_SENSORS)
set(SDL_SENSOR_DISABLED 1)
file(GLOB SENSORS_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${SENSORS_SOURCES})
endif()

# We always need to have threads and timers around
if(NOT HAVE_SDL_THREADS)
if test x$have_joystick != xyes; then
if test x$enable_joystick = xyes; then

$as_echo "#define SDL_JOYSTICK_DISABLED 1" >>confdefs.h
$as_echo "#define SDL_JOYSTICK_DUMMY 1" >>confdefs.h

fi
SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
fi
if test x$have_haptic != xyes; then
if test x$enable_haptic = xyes; then

$as_echo "#define SDL_HAPTIC_DISABLED 1" >>confdefs.h
$as_echo "#define SDL_HAPTIC_DUMMY 1" >>confdefs.h

fi
SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
fi
if test x$have_sensor != xyes; then
if test x$enable_sensor = xyes; then

$as_echo "#define SDL_SENSOR_DISABLED 1" >>confdefs.h
$as_echo "#define SDL_SENSOR_DUMMY 1" >>confdefs.h

fi
SOURCES="$SOURCES $srcdir/src/sensor/dummy/*.c"
@@ -4012,19 +4012,19 @@ esac

if test x$have_joystick != xyes; then
if test x$enable_joystick = xyes; then
AC_DEFINE(SDL_JOYSTICK_DISABLED, 1, [ ])
AC_DEFINE(SDL_JOYSTICK_DUMMY, 1, [ ])
fi
SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
fi
if test x$have_haptic != xyes; then
if test x$enable_haptic = xyes; then
AC_DEFINE(SDL_HAPTIC_DISABLED, 1, [ ])
AC_DEFINE(SDL_HAPTIC_DUMMY, 1, [ ])
fi
SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
fi
if test x$have_sensor != xyes; then
if test x$enable_sensor = xyes; then
AC_DEFINE(SDL_SENSOR_DISABLED, 1, [ ])
AC_DEFINE(SDL_SENSOR_DUMMY, 1, [ ])
fi
SOURCES="$SOURCES $srcdir/src/sensor/dummy/*.c"
fi

0 comments on commit c17d629

Please sign in to comment.