include config.h to always have the correct types (float/double) exposed
authorChris Russ <christoph.russ@roames.com.au>
Tue, 16 Aug 2016 21:57:31 +0000 (07:57 +1000)
committerChris Russ <christoph.russ@roames.com.au>
Tue, 16 Aug 2016 21:57:31 +0000 (07:57 +1000)
code/Importer.cpp
include/assimp/cexport.h
include/assimp/cimport.h
include/assimp/defs.h

index 978f7c7..45b91fe 100644 (file)
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <assimp/version.h>
+#include <assimp/config.h>
 
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.
index 84eee44..f77d23c 100644 (file)
@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 // Public ASSIMP data structures
-#include <assimp/types.h>
 #include <assimp/config.h>
+#include <assimp/types.h>
 
 #ifdef __cplusplus
 extern "C" {
index ad06e66..231230c 100644 (file)
@@ -46,7 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
 
-#include "types.h"
+#include <assimp/config.h>
+#include <assimp/types.h>
 #include "importerdesc.h"
 
 #ifdef __cplusplus
index d62dd30..f68d69c 100644 (file)
@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DEFINES_H_INC
 #define AI_DEFINES_H_INC
 
+#include <assimp/config.h>
+
     //////////////////////////////////////////////////////////////////////////
     /* Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific
      * file format loader. The loader is be excluded from the