CMakeLists.txt
changeset 9431 a9c73f29a15e
parent 9414 669bf9fb901e
child 9466 510c9a2f0951
     1.1 --- a/CMakeLists.txt	Tue Mar 24 03:12:35 2015 -0400
     1.2 +++ b/CMakeLists.txt	Tue Mar 24 03:21:57 2015 -0400
     1.3 @@ -118,9 +118,9 @@
     1.4  endif()
     1.5  
     1.6  if (UNIX_OR_MAC_SYS AND NOT EMSCRIPTEN) # JavaScript does not yet have threading support, so disable pthreads when building for Emscripten.
     1.7 -  set(PTHREADS_ENABLED_BY_DEFAULT ON)
     1.8 +  set(SDL_PTHREADS_ENABLED_BY_DEFAULT ON)
     1.9  else()
    1.10 -  set(PTHREADS_ENABLED_BY_DEFAULT OFF)
    1.11 +  set(SDL_PTHREADS_ENABLED_BY_DEFAULT OFF)
    1.12  endif()
    1.13  
    1.14  # Default option knobs
    1.15 @@ -202,6 +202,7 @@
    1.16  
    1.17  # All these ENABLED_BY_DEFAULT vars will default to ON if not specified, so
    1.18  #  you only need to have a platform override them if they are disabling.
    1.19 +set(OPT_DEF_ASM TRUE)
    1.20  if(EMSCRIPTEN)
    1.21    # Set up default values for the currently supported set of subsystems:
    1.22    # Emscripten/Javascript does not have assembly support, a dynamic library 
    1.23 @@ -212,20 +213,12 @@
    1.24    set(SDL_THREADS_ENABLED_BY_DEFAULT OFF)
    1.25    set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF)
    1.26    set(SDL_CPUINFO_ENABLED_BY_DEFAULT OFF)
    1.27 -  set(DLOPEN_ENABLED_BY_DEFAULT OFF)
    1.28 -else()
    1.29 -  set(OPT_DEF_ASM TRUE)
    1.30 -  set(SDL_SHARED_ENABLED_BY_DEFAULT ON)
    1.31 -  set(SDL_ATOMIC_ENABLED_BY_DEFAULT ON)
    1.32 -  set(SDL_THREADS_ENABLED_BY_DEFAULT ON)
    1.33 -  set(SDL_LOADSO_ENABLED_BY_DEFAULT ON)
    1.34 -  set(SDL_CPUINFO_ENABLED_BY_DEFAULT ON)
    1.35 -  set(DLOPEN_ENABLED_BY_DEFAULT ON)
    1.36 +  set(SDL_DLOPEN_ENABLED_BY_DEFAULT OFF)
    1.37  endif()
    1.38  
    1.39  set(SDL_SUBSYSTEMS
    1.40      Atomic Audio Video Render Events Joystick Haptic Power Threads Timers
    1.41 -    File Loadso CPUinfo Filesystem)
    1.42 +    File Loadso CPUinfo Filesystem Dlopen)
    1.43  foreach(_SUB ${SDL_SUBSYSTEMS})
    1.44    string(TOUPPER ${_SUB} _OPT)
    1.45    if (NOT DEFINED SDL_${_OPT}_ENABLED_BY_DEFAULT)
    1.46 @@ -254,9 +247,9 @@
    1.47  set_option(VIDEO_DUMMY         "Use dummy video driver" ON)
    1.48  set_option(VIDEO_OPENGL        "Include OpenGL support" ON)
    1.49  set_option(VIDEO_OPENGLES      "Include OpenGL ES support" ON)
    1.50 -set_option(PTHREADS            "Use POSIX threads for multi-threading" ${PTHREADS_ENABLED_BY_DEFAULT})
    1.51 +set_option(PTHREADS            "Use POSIX threads for multi-threading" ${SDL_PTHREADS_ENABLED_BY_DEFAULT})
    1.52  dep_option(PTHREADS_SEM        "Use pthread semaphores" ON "PTHREADS" OFF)
    1.53 -set_option(SDL_DLOPEN          "Use dlopen for shared object loading" ${DLOPEN_ENABLED_BY_DEFAULT})
    1.54 +set_option(SDL_DLOPEN          "Use dlopen for shared object loading" ${SDL_DLOPEN_ENABLED_BY_DEFAULT})
    1.55  set_option(OSS                 "Support the OSS audio API" ${UNIX_SYS})
    1.56  set_option(ALSA                "Support the ALSA audio API" ${UNIX_SYS})
    1.57  dep_option(ALSA_SHARED         "Dynamically load ALSA audio support" ON "ALSA" OFF)