mirror of https://github.com/encounter/SDL.git
add 'Misc' subsystem II.
This commit is contained in:
parent
118de86202
commit
ea8cf4bd0f
|
@ -822,6 +822,7 @@ enable_filesystem
|
||||||
enable_threads
|
enable_threads
|
||||||
enable_timers
|
enable_timers
|
||||||
enable_file
|
enable_file
|
||||||
|
enable_misc
|
||||||
enable_loadso
|
enable_loadso
|
||||||
enable_cpuinfo
|
enable_cpuinfo
|
||||||
enable_assembly
|
enable_assembly
|
||||||
|
@ -1599,6 +1600,7 @@ Optional Features:
|
||||||
--enable-threads Enable the threading subsystem [default=yes]
|
--enable-threads Enable the threading subsystem [default=yes]
|
||||||
--enable-timers Enable the timer subsystem [default=yes]
|
--enable-timers Enable the timer subsystem [default=yes]
|
||||||
--enable-file Enable the file subsystem [default=yes]
|
--enable-file Enable the file subsystem [default=yes]
|
||||||
|
--enable-misc Enable the misc subsystem [default=yes]
|
||||||
--enable-loadso Enable the shared object loading subsystem
|
--enable-loadso Enable the shared object loading subsystem
|
||||||
[default=yes]
|
[default=yes]
|
||||||
--enable-cpuinfo Enable the cpuinfo subsystem [default=yes]
|
--enable-cpuinfo Enable the cpuinfo subsystem [default=yes]
|
||||||
|
@ -18100,6 +18102,20 @@ $as_echo "#define SDL_FILESYSTEM_DISABLED 1" >>confdefs.h
|
||||||
else
|
else
|
||||||
SUMMARY_modules="${SUMMARY_modules} filesystem"
|
SUMMARY_modules="${SUMMARY_modules} filesystem"
|
||||||
fi
|
fi
|
||||||
|
# Check whether --enable-misc was given.
|
||||||
|
if test "${enable_misc+set}" = set; then :
|
||||||
|
enableval=$enable_misc;
|
||||||
|
else
|
||||||
|
enable_misc=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$enable_misc != xyes; then
|
||||||
|
|
||||||
|
$as_echo "#define SDL_MISC_DISABLED 1" >>confdefs.h
|
||||||
|
|
||||||
|
else
|
||||||
|
SUMMARY_modules="${SUMMARY_modules} misc"
|
||||||
|
fi
|
||||||
# Check whether --enable-threads was given.
|
# Check whether --enable-threads was given.
|
||||||
if test "${enable_threads+set}" = set; then :
|
if test "${enable_threads+set}" = set; then :
|
||||||
enableval=$enable_threads;
|
enableval=$enable_threads;
|
||||||
|
@ -25818,8 +25834,11 @@ $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
|
||||||
CheckRPATH
|
CheckRPATH
|
||||||
CheckVivanteVideo
|
CheckVivanteVideo
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/unix/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/unix/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
|
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/unix/*.c"
|
SOURCES="$SOURCES $srcdir/src/locale/unix/*.c"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -26035,8 +26054,11 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
|
||||||
|
|
||||||
# Set up the core platform files
|
# Set up the core platform files
|
||||||
SOURCES="$SOURCES $srcdir/src/core/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/core/windows/*.c"
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/windows/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Use the Windows locale APIs.
|
# Use the Windows locale APIs.
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/locale/windows/*.c"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -26323,10 +26345,11 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h
|
||||||
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
|
||||||
have_filesystem=yes
|
have_filesystem=yes
|
||||||
fi
|
fi
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/misc/haiku/*.cc"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/locale/haiku/*.cc"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -26350,9 +26373,11 @@ $as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h
|
||||||
CheckVulkan
|
CheckVulkan
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/ios/*.m"
|
SOURCES="$SOURCES $srcdir/src/misc/ios/*.m"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -26484,9 +26509,11 @@ $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
CheckHIDAPI
|
CheckHIDAPI
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/misc/macosx/*.m"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -26673,9 +26700,11 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
CheckClockGettime
|
CheckClockGettime
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the video library
|
# Set up files for the video library
|
||||||
if test x$enable_video = xyes; then
|
if test x$enable_video = xyes; then
|
||||||
|
|
||||||
|
|
31
configure.ac
31
configure.ac
|
@ -527,6 +527,14 @@ if test x$enable_file != xyes; then
|
||||||
else
|
else
|
||||||
SUMMARY_modules="${SUMMARY_modules} file"
|
SUMMARY_modules="${SUMMARY_modules} file"
|
||||||
fi
|
fi
|
||||||
|
AC_ARG_ENABLE(misc,
|
||||||
|
[AS_HELP_STRING([--enable-misc], [Enable the misc subsystem [default=yes]])],
|
||||||
|
, enable_misc=yes)
|
||||||
|
if test x$enable_misc != xyes; then
|
||||||
|
AC_DEFINE(SDL_MISC_DISABLED, 1, [ ])
|
||||||
|
else
|
||||||
|
SUMMARY_modules="${SUMMARY_modules} misc"
|
||||||
|
fi
|
||||||
AC_ARG_ENABLE(loadso,
|
AC_ARG_ENABLE(loadso,
|
||||||
[AS_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [default=yes]])],
|
[AS_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [default=yes]])],
|
||||||
, enable_loadso=yes)
|
, enable_loadso=yes)
|
||||||
|
@ -3715,8 +3723,11 @@ case "$host" in
|
||||||
CheckRPATH
|
CheckRPATH
|
||||||
CheckVivanteVideo
|
CheckVivanteVideo
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/unix/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/unix/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
|
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/unix/*.c"
|
SOURCES="$SOURCES $srcdir/src/locale/unix/*.c"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -3898,8 +3909,11 @@ case "$host" in
|
||||||
|
|
||||||
# Set up the core platform files
|
# Set up the core platform files
|
||||||
SOURCES="$SOURCES $srcdir/src/core/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/core/windows/*.c"
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/windows/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Use the Windows locale APIs.
|
# Use the Windows locale APIs.
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/windows/*.c"
|
SOURCES="$SOURCES $srcdir/src/locale/windows/*.c"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -4086,10 +4100,11 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
|
||||||
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
|
||||||
have_filesystem=yes
|
have_filesystem=yes
|
||||||
fi
|
fi
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/misc/haiku/*.cc"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/haiku/*.cc"
|
SOURCES="$SOURCES $srcdir/src/locale/haiku/*.cc"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -4113,9 +4128,11 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
|
||||||
CheckVulkan
|
CheckVulkan
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/ios/*.m"
|
SOURCES="$SOURCES $srcdir/src/misc/ios/*.m"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -4225,9 +4242,11 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
CheckHIDAPI
|
CheckHIDAPI
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/misc/macosx/*.m"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the locale library
|
# Set up files for the locale library
|
||||||
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
SOURCES="$SOURCES $srcdir/src/locale/macosx/*.m"
|
||||||
have_locale=yes
|
have_locale=yes
|
||||||
|
@ -4386,9 +4405,11 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
CheckClockGettime
|
CheckClockGettime
|
||||||
|
|
||||||
|
# Set up files for the misc library
|
||||||
|
if test x$enable_misc = xyes; then
|
||||||
SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c"
|
SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c"
|
||||||
have_misc=yes
|
have_misc=yes
|
||||||
|
fi
|
||||||
# Set up files for the video library
|
# Set up files for the video library
|
||||||
if test x$enable_video = xyes; then
|
if test x$enable_video = xyes; then
|
||||||
AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS, 1, [ ])
|
AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS, 1, [ ])
|
||||||
|
|
Loading…
Reference in New Issue