From 9d8a9ea826ac733e7076d567ef2a6b5200de68c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 6 Mar 2020 13:31:52 +0100 Subject: assimp: Clean and document buildsystem, prepare for unbundling - Improve the SCsub to allow unbundling and remove unnecessary code. - Move files around to match upstream source. - Re-sync with upstream commit 308db73d0b3c2d1870cd3e465eaa283692a4cf23 to ensure we don't have local modifications. - Doesn't actually build against current version 5.0.1 due to the lack of the new ArmaturePopulate API that Gordon authored. We'll have to wait for a public release with that API (5.1?) to enable unbundling. --- thirdparty/assimp/code/revision.h | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 thirdparty/assimp/code/revision.h (limited to 'thirdparty/assimp/code') diff --git a/thirdparty/assimp/code/revision.h b/thirdparty/assimp/code/revision.h deleted file mode 100644 index 66eb875303..0000000000 --- a/thirdparty/assimp/code/revision.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef ASSIMP_REVISION_H_INC -#define ASSIMP_REVISION_H_INC - -#define GitVersion 0x308db73d -#define GitBranch "master" - -#define VER_MAJOR 5 -#define VER_MINOR 0 -#define VER_PATCH 0 -#define VER_BUILD 0 - -#define STR_HELP(x) #x -#define STR(x) STR_HELP(x) - -#define VER_FILEVERSION VER_MAJOR,VER_MINOR,VER_PATCH,VER_BUILD -#if (GitVersion == 0) -#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) -#else -#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit 308db73d)" -#endif - -#ifdef NDEBUG -#define VER_ORIGINAL_FILENAME_STR "assimp.dll" -#else -#define VER_ORIGINAL_FILENAME_STR "assimp.dll" -#endif // NDEBUG - -#endif // ASSIMP_REVISION_H_INC -- cgit v1.2.3