this repo has no description
fork

Configure Feed

Select the types of activity you want to include in your feed.

Some improvements for ARM systems with CMake.

+21 -8
+14 -5
CMakeLists.txt
··· 204 204 else (SDL_gpu_DISABLE_GLES) 205 205 206 206 if(ANDROID) 207 - find_library( ANDROID_LOG_LIBRARY log ) 208 - find_library( ANDROID_GLES2_LIBRARY GLESv2 ) 209 - find_library( ANDROID_GLES1_LIBRARY GLESv1_CM ) 207 + 208 + if (NOT SDL_gpu_DISABLE_GLES_1) 209 + find_library( ANDROID_GLES1_LIBRARY GLESv1_CM ) 210 + link_libraries( 211 + ${ANDROID_GLES1_LIBRARY} 212 + ) 213 + endif() 214 + if (NOT SDL_gpu_DISABLE_GLES_2) 215 + find_library( ANDROID_GLES2_LIBRARY GLESv2 ) 216 + link_libraries( 217 + ${ANDROID_GLES2_LIBRARY} 218 + ) 219 + endif() 210 220 link_libraries( 211 221 ${ANDROID_LOG_LIBRARY} 212 - ${ANDROID_GLES2_LIBRARY} 213 - ${ANDROID_GLES1_LIBRARY} 214 222 ) 215 223 else() 216 224 find_package(OpenGLES REQUIRED) ··· 329 337 if(SDL_gpu_BUILD_TOOLS) 330 338 add_subdirectory(tools) 331 339 endif(SDL_gpu_BUILD_TOOLS) 340 +
+5 -1
scripts/FindOpenGLES.cmake
··· 103 103 SET( OPENGLES_FOUND "NO" ) 104 104 IF(OPENGLES_gl_LIBRARY) 105 105 106 - SET( OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY} ${OPENGLES_gl1_LIBRARY} ${OPENGLES_LIBRARIES}) 106 + IF(NOT OPENGLES_gl1_FOUND) 107 + SET(OPENGLES_gl1_LIBRARY "") 108 + ENDIF() 109 + 110 + SET( OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY} ${OPENGLES_gl1_LIBRARY} ${OPENGLES_LIBRARIES}) 107 111 108 112 SET( OPENGLES_FOUND "YES" ) 109 113
+2 -2
src/CMakeLists.txt
··· 207 207 endif(SDL_gpu_USE_SDL1) 208 208 209 209 if(SDL_gpu_BUILD_SHARED) 210 - install(TARGETS SDL_gpu_shared EXPORT SDL_gpu-targets DESTINATION ${OUTPUT_DIR}/lib) 210 + install(TARGETS SDL_gpu_shared EXPORT SDL_gpu-targets DESTINATION lib) 211 211 endif() 212 212 if(SDL_gpu_BUILD_STATIC) 213 - install(TARGETS SDL_gpu EXPORT SDL_gpu-targets DESTINATION ${OUTPUT_DIR}/lib) 213 + install(TARGETS SDL_gpu EXPORT SDL_gpu-targets DESTINATION lib) 214 214 endif() 215 215 216 216 endif(SDL_gpu_INSTALL)