encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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".
This commit is contained in:
Sam Lantinga 2018-09-28 21:19:27 -07:00
parent 14d2ec80e7
commit c17d62996f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -1565,7 +1565,7 @@ endif()
# This leads to missing internal references on building, since the # This leads to missing internal references on building, since the
# src/X/*.c does not get included. # src/X/*.c does not get included.
if(NOT HAVE_SDL_JOYSTICK) 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 if(SDL_JOYSTICK AND NOT APPLE) # results in unresolved symbols on OSX
file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/dummy/*.c) file(GLOB JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/dummy/*.c)
@ -1573,10 +1573,15 @@ if(NOT HAVE_SDL_JOYSTICK)
endif() endif()
endif() endif()
if(NOT HAVE_SDL_HAPTIC) 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) file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${HAPTIC_SOURCES})
endif() 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) if(NOT HAVE_SDL_LOADSO)
set(SDL_LOADSO_DISABLED 1) set(SDL_LOADSO_DISABLED 1)
file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dummy/*.c) 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) file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/dummy/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
endif() 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 # We always need to have threads and timers around
if(NOT HAVE_SDL_THREADS) if(NOT HAVE_SDL_THREADS)

6
configure vendored
View File

@ -24819,7 +24819,7 @@ esac
if test x$have_joystick != xyes; then if test x$have_joystick != xyes; then
if test x$enable_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 fi
SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
@ -24827,7 +24827,7 @@ fi
if test x$have_haptic != xyes; then if test x$have_haptic != xyes; then
if test x$enable_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 fi
SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c" SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
@ -24835,7 +24835,7 @@ fi
if test x$have_sensor != xyes; then if test x$have_sensor != xyes; then
if test x$enable_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 fi
SOURCES="$SOURCES $srcdir/src/sensor/dummy/*.c" SOURCES="$SOURCES $srcdir/src/sensor/dummy/*.c"

6
configure.in
View File

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