diff --git a/CMakeLists.txt b/CMakeLists.txt index f1e2d2d3e..718a251e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -761,8 +761,8 @@ IF ( ASSIMP_INSTALL ) ENDIF() CONFIGURE_FILE( - ${CMAKE_CURRENT_LIST_DIR}/revision.h.in - ${CMAKE_CURRENT_BINARY_DIR}/revision.h + ${CMAKE_CURRENT_LIST_DIR}/include/assimp/revision.h.in + ${CMAKE_CURRENT_BINARY_DIR}/include/assimp/revision.h ) CONFIGURE_FILE( diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp index ef8bbc9f5..2fca44824 100644 --- a/code/Common/Version.cpp +++ b/code/Common/Version.cpp @@ -44,8 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ScenePrivate.h" #include #include - -#include "revision.h" +#include // -------------------------------------------------------------------------------- // Legal information string - don't remove this. diff --git a/code/res/assimp.rc b/code/res/assimp.rc index fd10935f6..6c9356276 100644 --- a/code/res/assimp.rc +++ b/code/res/assimp.rc @@ -1,4 +1,4 @@ -#include "revision.h" +#include #ifdef __GNUC__ #include "winresrc.h" #else diff --git a/revision.h.in b/include/assimp/revision.h.in similarity index 100% rename from revision.h.in rename to include/assimp/revision.h.in diff --git a/tools/assimp_cmd/assimp_cmd.rc b/tools/assimp_cmd/assimp_cmd.rc index 2ead81bcb..63478d356 100644 --- a/tools/assimp_cmd/assimp_cmd.rc +++ b/tools/assimp_cmd/assimp_cmd.rc @@ -1,4 +1,4 @@ -#include "revision.h" +#include #if defined(__GNUC__) && defined(_WIN32) #include "winresrc.h" #else diff --git a/tools/assimp_view/assimp_view.rc b/tools/assimp_view/assimp_view.rc index 1dc4f7f52..10b762059 100644 --- a/tools/assimp_view/assimp_view.rc +++ b/tools/assimp_view/assimp_view.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" -#include "revision.h" +#include #define APSTUDIO_READONLY_SYMBOLS /////////////////////////////////////////////////////////////////////////////