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

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

View file

@ -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<vkMeshLoader::VertexLayout> vertexLayout,
float scale);
#endif
// Start the main render loop
void renderLoop();