Commit c17d62996fbbaf1fd041c60c27471c387f63b0cf
2018-09-28T21:19:27
Mark a subsystem as dummy, not disabled, if it was intended to be compiled 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".
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c213bc4..302ba2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1565,7 +1565,7 @@ 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)
@@ -1573,10 +1573,15 @@ if(NOT HAVE_SDL_JOYSTICK)
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)
diff --git a/configure b/configure
index e5ecea0..aee0cb6 100755
--- a/configure
+++ b/configure
@@ -24819,7 +24819,7 @@ esac
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"
@@ -24827,7 +24827,7 @@ 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"
@@ -24835,7 +24835,7 @@ 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"
diff --git a/configure.in b/configure.in
index 8711587..ae866ff 100644
--- a/configure.in
+++ b/configure.in
@@ -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