Răsfoiți Sursa

include config.h to always have the correct types (float/double) exposed

Chris Russ 9 ani în urmă
părinte
comite
3f08cebfab
4 a modificat fișierele cu 6 adăugiri și 2 ștergeri
  1. 1 0
      code/Importer.cpp
  2. 1 1
      include/assimp/cexport.h
  3. 2 1
      include/assimp/cimport.h
  4. 2 0
      include/assimp/defs.h

+ 1 - 0
code/Importer.cpp

@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
 #include <assimp/version.h>
 #include <assimp/version.h>
+#include <assimp/config.h>
 
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.

+ 1 - 1
include/assimp/cexport.h

@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 
 // Public ASSIMP data structures
 // Public ASSIMP data structures
-#include <assimp/types.h>
 #include <assimp/config.h>
 #include <assimp/config.h>
+#include <assimp/types.h>
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus
 extern "C" {
 extern "C" {

+ 2 - 1
include/assimp/cimport.h

@@ -46,7 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSIMP_H_INC
 #ifndef AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
 
 
-#include "types.h"
+#include <assimp/config.h>
+#include <assimp/types.h>
 #include "importerdesc.h"
 #include "importerdesc.h"
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus

+ 2 - 0
include/assimp/defs.h

@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DEFINES_H_INC
 #ifndef AI_DEFINES_H_INC
 #define AI_DEFINES_H_INC
 #define AI_DEFINES_H_INC
 
 
+#include <assimp/config.h>
+
     //////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////
     /* Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific
     /* Define ASSIMP_BUILD_NO_XX_IMPORTER to disable a specific
      * file format loader. The loader is be excluded from the
      * file format loader. The loader is be excluded from the