diff --git a/android/texture/jni/Android.mk b/android/texture/jni/Android.mk index 6fd11ed2..8cdb0249 100644 --- a/android/texture/jni/Android.mk +++ b/android/texture/jni/Android.mk @@ -2,11 +2,11 @@ LOCAL_PATH := $(call my-dir)/../../texture # assimp -#include $(CLEAR_VARS) +include $(CLEAR_VARS) -#LOCAL_MODULE := assimp -#LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a -#include $(PREBUILT_STATIC_LIBRARY) +LOCAL_MODULE := assimp +LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a +include $(PREBUILT_STATIC_LIBRARY) # vulkan example @@ -33,14 +33,13 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/ LOCAL_SRC_FILES := $(PROJECT_FILES) -LOCAL_LDLIBS := -landroid -llog -#LOCAL_SHARED_LIBRARIES += assimp +LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += cpufeatures -#LOCAL_STATIC_LIBRARIES += libassimp +LOCAL_STATIC_LIBRARIES += libassimp include $(BUILD_SHARED_LIBRARY) diff --git a/android/triangle/jni/Android.mk b/android/triangle/jni/Android.mk index 5547efaa..2e570be4 100644 --- a/android/triangle/jni/Android.mk +++ b/android/triangle/jni/Android.mk @@ -2,11 +2,11 @@ LOCAL_PATH := $(call my-dir)/.. # assimp -#include $(CLEAR_VARS) +include $(CLEAR_VARS) -#LOCAL_MODULE := assimp -#LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a -#include $(PREBUILT_STATIC_LIBRARY) +LOCAL_MODULE := assimp +LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a +include $(PREBUILT_STATIC_LIBRARY) # vulkan example @@ -33,8 +33,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/ LOCAL_SRC_FILES := $(PROJECT_FILES) -LOCAL_LDLIBS := -landroid -llog -#LOCAL_SHARED_LIBRARIES += assimp +LOCAL_LDLIBS := -landroid -llog -lz LOCAL_DISABLE_FORMAT_STRING_CHECKS := true diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp index 212061f9..7275b9c3 100644 --- a/base/vulkanexamplebase.cpp +++ b/base/vulkanexamplebase.cpp @@ -284,7 +284,6 @@ VkBool32 VulkanExampleBase::createBuffer(VkBufferUsageFlags usage, VkDeviceSize } } -#ifndef __ANDROID__ void VulkanExampleBase::loadMesh( const char * filename, vkMeshLoader::MeshBuffer * meshBuffer, @@ -304,7 +303,6 @@ void VulkanExampleBase::loadMesh( delete(mesh); } -#endif void VulkanExampleBase::renderLoop() { diff --git a/base/vulkanexamplebase.h b/base/vulkanexamplebase.h index 32300304..12e1daad 100644 --- a/base/vulkanexamplebase.h +++ b/base/vulkanexamplebase.h @@ -38,9 +38,7 @@ #include "vulkanswapchain.hpp" #include "vulkanTextureLoader.hpp" -#ifndef __ANDROID__ #include "vulkanMeshLoader.hpp" -#endif class VulkanExampleBase { @@ -267,14 +265,12 @@ public: VkDescriptorBufferInfo *descriptor); // Load a mesh (using ASSIMP) and create vulkan vertex and index buffers with given vertex layout - // todo : mesh loader not yet enabled for Android -#ifndef __ANDROID__ void loadMesh( const char *filename, vkMeshLoader::MeshBuffer *meshBuffer, std::vector vertexLayout, float scale); -#endif + // Start the main render loop void renderLoop(); diff --git a/libs/assimp/armeabi-v7a/libassimp.a b/libs/assimp/armeabi-v7a/libassimp.a new file mode 100644 index 00000000..0b6abf20 Binary files /dev/null and b/libs/assimp/armeabi-v7a/libassimp.a differ