|
@@ -210,8 +210,8 @@ endif()
|
|
|
set(SDL_LIBS "-lSDL2")
|
|
|
set(SDL_CFLAGS "")
|
|
|
|
|
|
-# Emscripten toolchain has a nonempty default value for this, and the checks
|
|
|
-# in this file need to change that, so remember the original value, and
|
|
|
+# Emscripten toolchain has a nonempty default value for this, and the checks
|
|
|
+# in this file need to change that, so remember the original value, and
|
|
|
# restore back to that afterwards. For check_function_exists() to work in
|
|
|
# Emscripten, this value must be at its default value.
|
|
|
set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
|
@@ -244,7 +244,7 @@ endif()
|
|
|
set(OPT_DEF_ASM TRUE)
|
|
|
if(EMSCRIPTEN)
|
|
|
# Set up default values for the currently supported set of subsystems:
|
|
|
- # Emscripten/Javascript does not have assembly support, a dynamic library
|
|
|
+ # Emscripten/Javascript does not have assembly support, a dynamic library
|
|
|
# loading architecture, low-level CPU inspection or multithreading.
|
|
|
set(OPT_DEF_ASM FALSE)
|
|
|
set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
|
|
@@ -1001,7 +1001,7 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
|
|
|
#include <linux/kd.h>
|
|
|
#include <linux/keyboard.h>
|
|
|
|
|
|
- int main(int argc, char **argv)
|
|
|
+ int main(int argc, char **argv)
|
|
|
{
|
|
|
struct kbentry kbe;
|
|
|
kbe.kb_table = KG_CTRL;
|
|
@@ -1761,7 +1761,7 @@ endif()
|
|
|
if(SDL_TEST)
|
|
|
file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c)
|
|
|
add_library(SDL2_test STATIC ${TEST_SOURCES})
|
|
|
-
|
|
|
+
|
|
|
add_subdirectory(test)
|
|
|
endif()
|
|
|
|
|
@@ -1818,7 +1818,7 @@ if(NOT (WINDOWS OR CYGWIN))
|
|
|
if(NOT ANDROID)
|
|
|
install(CODE "
|
|
|
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
|
|
|
- \"libSDL2-2.0.${SOEXT}\" \"libSDL2.${SOEXT}\")")
|
|
|
+ \"${SDL2_BINARY_DIR}/libSDL2-2.0${SDL_CMAKE_DEBUG_POSTFIX}.${SOEXT}\" \"${SDL2_BINARY_DIR}/libSDL2.${SOEXT}\")")
|
|
|
install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SOEXT} DESTINATION "lib${LIB_SUFFIX}")
|
|
|
endif()
|
|
|
endif()
|