Fixed bug 3918 - HIDAPI, CMake support for android project
parent
13c4d5e7e3
commit
0a9c74aa9a
|
@ -933,6 +933,10 @@ if(ANDROID)
|
|||
list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_LOG_LIBRARY} ${ANDROID_LIBRARY_LIBRARY})
|
||||
add_definitions(-DGL_GLEXT_PROTOTYPES)
|
||||
|
||||
if (HAVE_HIDAPI)
|
||||
list(APPEND EXTRA_LIBS hidapi)
|
||||
endif()
|
||||
|
||||
#enable gles
|
||||
if(VIDEO_OPENGLES)
|
||||
set(SDL_VIDEO_OPENGL_EGL 1)
|
||||
|
@ -1863,6 +1867,10 @@ if (NOT ANDROID)
|
|||
set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
|
||||
endif()
|
||||
|
||||
if (ANDROID AND HAVE_HIDAPI)
|
||||
set(_INSTALL_LIBS ${_INSTALL_LIBS} "hidapi")
|
||||
endif()
|
||||
|
||||
if(SDL_SHARED)
|
||||
add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
|
||||
if(APPLE)
|
||||
|
|
|
@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.6)
|
|||
|
||||
project(GAME)
|
||||
|
||||
# Settings
|
||||
set(HIDAPI OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# armeabi-v7a requires cpufeatures library
|
||||
# include(AndroidNdkModules)
|
||||
# android_ndk_import_module_cpufeatures()
|
||||
|
|
Loading…
Reference in New Issue