diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp index f262c8186..1a3c86d29 100644 --- a/code/AssimpPCH.cpp +++ b/code/AssimpPCH.cpp @@ -4,6 +4,9 @@ #include "AssimpPCH.h" #include "./../include/assimp/version.h" +static const unsigned int MajorVersion = 3; +static const unsigned int MinorVersion = 1; + // -------------------------------------------------------------------------------- // Legal information string - dont't remove this. static const char* LEGAL_INFORMATION = @@ -25,13 +28,13 @@ ASSIMP_API const char* aiGetLegalString () { // ------------------------------------------------------------------------------------------------ // Get Assimp minor version ASSIMP_API unsigned int aiGetVersionMinor () { - return 0; + return MinorVersion; } // ------------------------------------------------------------------------------------------------ // Get Assimp major version ASSIMP_API unsigned int aiGetVersionMajor () { - return 3; + return MajorVersion; } // ------------------------------------------------------------------------------------------------ @@ -65,11 +68,11 @@ ASSIMP_API unsigned int aiGetCompileFlags () { // ------------------------------------------------------------------------------------------------ ASSIMP_API unsigned int aiGetVersionRevision () { - return SVNRevision; + return GitVersion; } // ------------------------------------------------------------------------------------------------ -ASSIMP_API aiScene::aiScene() +ASSIMP_API aiScene::aiScene() : mFlags(0) , mRootNode(NULL) , mNumMeshes(0) @@ -83,7 +86,7 @@ ASSIMP_API aiScene::aiScene() , mNumLights(0) , mLights(NULL) , mNumCameras(0) - , mCameras(NULL) + , mCameras(NULL) , mPrivate(new Assimp::ScenePrivateData()) { } diff --git a/include/assimp/version.h b/include/assimp/version.h index ca2d19e71..44e797a11 100644 --- a/include/assimp/version.h +++ b/include/assimp/version.h @@ -74,11 +74,10 @@ ASSIMP_API unsigned int aiGetVersionMajor (void); // --------------------------------------------------------------------------- /** @brief Returns the repository revision of the Assimp runtime. * @return SVN Repository revision number of the Assimp runtime the - * application was linked/built against + * application was linked/built against. */ ASSIMP_API unsigned int aiGetVersionRevision (void); - //! Assimp was compiled as a shared object (Windows: DLL) #define ASSIMP_CFLAGS_SHARED 0x1 //! Assimp was compiled against STLport diff --git a/revision.h b/revision.h index 17ce738de..8ed82b1ac 100644 --- a/revision.h +++ b/revision.h @@ -1 +1,6 @@ -#define SVNRevision 1270 +#ifndef ASSIMP_REVISION_H_INC +#define ASSIMP_REVISION_H_INC + +#define GitVersion 0xA0bA3A8; + +#endif // ASSIMP_REVISION_H_INC diff --git a/tools/assimp_cmd/assimp_cmd.rc b/tools/assimp_cmd/assimp_cmd.rc index 08cd681ab..9ff06bdd4 100644 --- a/tools/assimp_cmd/assimp_cmd.rc +++ b/tools/assimp_cmd/assimp_cmd.rc @@ -42,8 +42,8 @@ IDI_ASSIMP_VIEW ICON "../shared/assimp_tools_icon.ico // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,SVNRevision,0 - PRODUCTVERSION 1,1,SVNRevision,1 + FILEVERSION 1, 1, GitVersion, 0 + PRODUCTVERSION 1, 1, GitVersion, 1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L