diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2018-05-21 00:58:49 +0200 |
|---|---|---|
| committer | Ahmad Fatoum <ahmad@a3f.at> | 2018-05-21 01:17:13 +0200 |
| commit | bd2300fed34b458e4a419a486019afccf2ab39b1 (patch) | |
| tree | 249680970621564360684968da7396fe8d9c11cb | |
| parent | ad8509732ca2a235c1735fae739577a59e17cf1c (diff) | |
| download | raylib-bd2300fed34b458e4a419a486019afccf2ab39b1.tar.gz raylib-bd2300fed34b458e4a419a486019afccf2ab39b1.zip | |
CMake+Android: Skip tests with SetCameraMode
src/core.c does explicitly skip including <camera.h> on Android
and tests fail. Therefore skip these failing tests.
Closes #507.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 30994015..82f73e8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,9 @@ script: - if [ "$GLFW" != "SYSTEM" ]; then make package; fi; - sudo make install - pkg-config --static --libs raylib - - nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false) + - if [[ "$ARCH" != *-android ]]; then + nm -g release/libraylib.a | grep glfwGetProcAddress || (echo "libraylib.a doesn't contain GLFW symbols! Aborting..." && false); + fi deploy: provider: releases diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index ae882444..fd65a74b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -40,6 +40,29 @@ if(NOT HAVE_OCULUS_CAPI) endif() list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/standard_lighting.c) +if(${PLATFORM} MATCHES "Android") + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_3d_picking.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_vr_simulator.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_3d_camera_free.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_3d_camera_first_person.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/core/core_world_screen.c) + + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_picking.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_material_pbr.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_cubicmap.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_skybox.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_picking.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_mesh_generation.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_heightmap.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/models/models_billboard.c) + + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_custom_uniform.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_model_shader.c) + list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_postprocessing.c) + +endif() + # Do each example foreach(example_source ${example_sources}) |