claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added assimp (static library) to android makefiles (#97)

Browse source
This commit is contained in:
Sascha Willems 2016-03-22 13:41:30 +01:00
parent 16440383c5
commit 01c12ef327
5 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
android/texture/jni/Android.mk
View file

@ -2,11 +2,11 @@ LOCAL_PATH := $(call my-dir)/../../texture
# assimp # assimp
#include $(CLEAR_VARS) include $(CLEAR_VARS)
#LOCAL_MODULE := assimp LOCAL_MODULE := assimp
#LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
#include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
# vulkan example # vulkan example
@ -33,14 +33,13 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_SRC_FILES := $(PROJECT_FILES)
LOCAL_LDLIBS := -landroid -llog LOCAL_LDLIBS := -landroid -llog -lz
#LOCAL_SHARED_LIBRARIES += assimp
LOCAL_DISABLE_FORMAT_STRING_CHECKS := true LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
LOCAL_STATIC_LIBRARIES += android_native_app_glue LOCAL_STATIC_LIBRARIES += android_native_app_glue
LOCAL_STATIC_LIBRARIES += cpufeatures LOCAL_STATIC_LIBRARIES += cpufeatures
#LOCAL_STATIC_LIBRARIES += libassimp LOCAL_STATIC_LIBRARIES += libassimp
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

11
android/triangle/jni/Android.mk
View file

@ -2,11 +2,11 @@ LOCAL_PATH := $(call my-dir)/..
# assimp # assimp
#include $(CLEAR_VARS) include $(CLEAR_VARS)
#LOCAL_MODULE := assimp LOCAL_MODULE := assimp
#LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a
#include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
# vulkan example # vulkan example
@ -33,8 +33,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
LOCAL_SRC_FILES := $(PROJECT_FILES) LOCAL_SRC_FILES := $(PROJECT_FILES)
LOCAL_LDLIBS := -landroid -llog LOCAL_LDLIBS := -landroid -llog -lz
#LOCAL_SHARED_LIBRARIES += assimp
LOCAL_DISABLE_FORMAT_STRING_CHECKS := true LOCAL_DISABLE_FORMAT_STRING_CHECKS := true

2
base/vulkanexamplebase.cpp
View file

@ -284,7 +284,6 @@ VkBool32 VulkanExampleBase::createBuffer(VkBufferUsageFlags usage, VkDeviceSize
} }
} }
#ifndef __ANDROID__
void VulkanExampleBase::loadMesh( void VulkanExampleBase::loadMesh(
const char * filename, const char * filename,
vkMeshLoader::MeshBuffer * meshBuffer, vkMeshLoader::MeshBuffer * meshBuffer,
@ -304,7 +303,6 @@ void VulkanExampleBase::loadMesh(
delete(mesh); delete(mesh);
} }
#endif
void VulkanExampleBase::renderLoop() void VulkanExampleBase::renderLoop()
{ {

6
base/vulkanexamplebase.h
View file

@ -38,9 +38,7 @@
#include "vulkanswapchain.hpp" #include "vulkanswapchain.hpp"
#include "vulkanTextureLoader.hpp" #include "vulkanTextureLoader.hpp"
#ifndef __ANDROID__
#include "vulkanMeshLoader.hpp" #include "vulkanMeshLoader.hpp"
#endif
class VulkanExampleBase class VulkanExampleBase
{ {
@ -267,14 +265,12 @@ public:
VkDescriptorBufferInfo *descriptor); VkDescriptorBufferInfo *descriptor);
// Load a mesh (using ASSIMP) and create vulkan vertex and index buffers with given vertex layout // 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( void loadMesh(
const char *filename, const char *filename,
vkMeshLoader::MeshBuffer *meshBuffer, vkMeshLoader::MeshBuffer *meshBuffer,
std::vector<vkMeshLoader::VertexLayout> vertexLayout, std::vector<vkMeshLoader::VertexLayout> vertexLayout,
float scale); float scale);
#endif
// Start the main render loop // Start the main render loop
void renderLoop(); void renderLoop();

BIN
libs/assimp/armeabi-v7a/libassimp.a Normal file
View file

Binary file not shown.