Commit 85dff3e453a456ee4d778a4e515e6a04dbe91f63
2022-03-16T08:58:52
emscripten: obey enable-misc/SDL_MISC settings
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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c9b559..cc2264a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1175,10 +1175,11 @@ elseif(EMSCRIPTEN)
# project. Uncomment at will for verbose cross-compiling -I/../ path info.
target_compile_options(sdl-build-options INTERFACE "-Wno-warn-absolute-paths")
- file(GLOB EMSRIPTEN_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/emscripten/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${EMSRIPTEN_MISC_SOURCES})
- set(HAVE_SDL_MISC TRUE)
-
+ if(SDL_MISC)
+ file(GLOB EMSRIPTEN_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/emscripten/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${EMSRIPTEN_MISC_SOURCES})
+ set(HAVE_SDL_MISC TRUE)
+ endif()
if(SDL_AUDIO)
set(SDL_AUDIO_DRIVER_EMSCRIPTEN 1)
file(GLOB EM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/emscripten/*.c)
diff --git a/configure b/configure
index 18a9fc4..54a550c 100755
--- a/configure
+++ b/configure
@@ -26683,8 +26683,11 @@ $as_echo "#define SDL_AUDIO_DRIVER_EMSCRIPTEN 1" >>confdefs.h
CheckClockGettime
CheckEmscriptenGLES
- SOURCES="$SOURCES $srcdir/src/misc/emscripten/*.c"
- have_misc=yes
+ # Set up files for the misc library
+ if test x$enable_misc = xyes; then
+ SOURCES="$SOURCES $srcdir/src/misc/emscripten/*.c"
+ have_misc=yes
+ fi
# Set up files for the power library
if test x$enable_power = xyes; then
@@ -26695,7 +26698,7 @@ $as_echo "#define SDL_POWER_EMSCRIPTEN 1" >>confdefs.h
have_power=yes
fi
- # Set up files for the power library
+ # Set up files for the joystick library
if test x$enable_joystick = xyes; then
$as_echo "#define SDL_JOYSTICK_EMSCRIPTEN 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 0391c67..28d620d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4388,8 +4388,11 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
CheckClockGettime
CheckEmscriptenGLES
- SOURCES="$SOURCES $srcdir/src/misc/emscripten/*.c"
- have_misc=yes
+ # Set up files for the misc library
+ if test x$enable_misc = xyes; then
+ SOURCES="$SOURCES $srcdir/src/misc/emscripten/*.c"
+ have_misc=yes
+ fi
# Set up files for the power library
if test x$enable_power = xyes; then
@@ -4398,7 +4401,7 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
have_power=yes
fi
- # Set up files for the power library
+ # Set up files for the joystick library
if test x$enable_joystick = xyes; then
AC_DEFINE(SDL_JOYSTICK_EMSCRIPTEN, 1, [ ])
SOURCES="$SOURCES $srcdir/src/joystick/emscripten/*.c"