From c21c70ade60b7e3fdbf2fbdef24ce336787f5b3f Mon Sep 17 00:00:00 2001 From: byteblob Date: Wed, 9 Nov 2016 22:43:01 +0100 Subject: [PATCH 1/2] added void to aiGetErrorString's args --- include/assimp/cimport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/cimport.h b/include/assimp/cimport.h index 231230ca8..6d3fa4aea 100644 --- a/include/assimp/cimport.h +++ b/include/assimp/cimport.h @@ -337,7 +337,7 @@ ASSIMP_API void aiReleaseImport( * import process. NULL if there was no error. There can't be an error if you * got a non-NULL #aiScene from #aiImportFile/#aiImportFileEx/#aiApplyPostProcessing. */ -ASSIMP_API const char* aiGetErrorString(); +ASSIMP_API const char* aiGetErrorString(void); // -------------------------------------------------------------------------------- /** Returns whether a given file extension is supported by ASSIMP From 1c5030c642cda0a10b0f2e674ecd8b2881f590e2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 10 Nov 2016 16:26:17 +0100 Subject: [PATCH 2/2] Remove some whitespaces. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f0cc2b57..a08aa393b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,6 @@ ELSE (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER ) ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) - ADD_SUBDIRECTORY( code/ ) IF ( ASSIMP_BUILD_ASSIMP_TOOLS ) IF ( WIN32 )