CMakeLists.txt
changeset 13006 4a410f099040
parent 13001 1353fb9be62b
child 13039 bfed06214c2a
equal deleted inserted replaced
13005:ff2e36039fd2 13006:4a410f099040
   923     file(GLOB ANDROID_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/android/*.c)
   923     file(GLOB ANDROID_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/android/*.c)
   924     set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_VIDEO_SOURCES})
   924     set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_VIDEO_SOURCES})
   925     set(HAVE_SDL_VIDEO TRUE)
   925     set(HAVE_SDL_VIDEO TRUE)
   926 
   926 
   927     # Core stuff
   927     # Core stuff
   928     find_library(ANDROID_DL_LIBRARY dl)
   928     # find_library(ANDROID_DL_LIBRARY dl)
       
   929     # FIXME failing dlopen https://github.com/android-ndk/ndk/issues/929
       
   930     find_library(ANDROID_DL_LIBRARY NAMES libdl.so dl)
   929     find_library(ANDROID_LOG_LIBRARY log)
   931     find_library(ANDROID_LOG_LIBRARY log)
   930     find_library(ANDROID_LIBRARY_LIBRARY android)
   932     find_library(ANDROID_LIBRARY_LIBRARY android)
   931     list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_LOG_LIBRARY} ${ANDROID_LIBRARY_LIBRARY})
   933     list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_LOG_LIBRARY} ${ANDROID_LIBRARY_LIBRARY})
   932     add_definitions(-DGL_GLEXT_PROTOTYPES)
   934     add_definitions(-DGL_GLEXT_PROTOTYPES)
   933 
   935 
  1901     # Don't try to link with the default set of libraries.
  1903     # Don't try to link with the default set of libraries.
  1902     set_target_properties(hidapi PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB")
  1904     set_target_properties(hidapi PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB")
  1903     set_target_properties(hidapi PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB")
  1905     set_target_properties(hidapi PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB")
  1904     set_target_properties(hidapi PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB")
  1906     set_target_properties(hidapi PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB")
  1905   endif()
  1907   endif()
  1906   target_link_libraries(hidapi log)
  1908   if(HAVE_HIDAPI)
       
  1909     target_link_libraries(hidapi log)
       
  1910   endif()
  1907 endif()
  1911 endif()
  1908 
  1912 
  1909 if(SDL_STATIC)
  1913 if(SDL_STATIC)
  1910   set (BUILD_SHARED_LIBS FALSE)
  1914   set (BUILD_SHARED_LIBS FALSE)
  1911   add_library(SDL2-static STATIC ${SOURCE_FILES})
  1915   add_library(SDL2-static STATIC ${SOURCE_FILES})