CMakeLists.txt
changeset 13006 4a410f099040
parent 13001 1353fb9be62b
child 13039 bfed06214c2a
     1.1 --- a/CMakeLists.txt	Thu Aug 08 23:35:02 2019 +0300
     1.2 +++ b/CMakeLists.txt	Sun Aug 11 15:23:37 2019 +0200
     1.3 @@ -925,7 +925,9 @@
     1.4      set(HAVE_SDL_VIDEO TRUE)
     1.5  
     1.6      # Core stuff
     1.7 -    find_library(ANDROID_DL_LIBRARY dl)
     1.8 +    # find_library(ANDROID_DL_LIBRARY dl)
     1.9 +    # FIXME failing dlopen https://github.com/android-ndk/ndk/issues/929
    1.10 +    find_library(ANDROID_DL_LIBRARY NAMES libdl.so dl)
    1.11      find_library(ANDROID_LOG_LIBRARY log)
    1.12      find_library(ANDROID_LIBRARY_LIBRARY android)
    1.13      list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_LOG_LIBRARY} ${ANDROID_LIBRARY_LIBRARY})
    1.14 @@ -1903,7 +1905,9 @@
    1.15      set_target_properties(hidapi PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB")
    1.16      set_target_properties(hidapi PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB")
    1.17    endif()
    1.18 -  target_link_libraries(hidapi log)
    1.19 +  if(HAVE_HIDAPI)
    1.20 +    target_link_libraries(hidapi log)
    1.21 +  endif()
    1.22  endif()
    1.23  
    1.24  if(SDL_STATIC)