diff --git a/.gitignore b/.gitignore index 06afb258f..6095dc7d2 100644 --- a/.gitignore +++ b/.gitignore @@ -96,5 +96,6 @@ Thumbs.db /Save /Source/nragev20/Version.h /Source/Project64-audio/Version.h +/Source/Project64-core/Version.h /Source/Project64-input/Version.h /Source/Project64-video/Version.h diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props index 61cb4011d..f308865b3 100644 --- a/PropertySheets/Platform.props +++ b/PropertySheets/Platform.props @@ -31,6 +31,17 @@ + + + + %(PreprocessorDefinitions); + GIT_REVISION=$(GitRevision); + GIT_REVISION_SHORT=$(GitRevisionShort); + VERSION_BUILD=$(GitRevisionCount) + + + + $(SolutionDir) $(ROOT)Source\ diff --git a/Source/Project64-core/Version.h b/Source/Project64-core/Version.h deleted file mode 100644 index e9f585dd0..000000000 --- a/Source/Project64-core/Version.h +++ /dev/null @@ -1,59 +0,0 @@ -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#ifndef VERSION_MAJOR -#define VERSION_MAJOR 4 -#endif -#ifndef VERSION_MINOR -#define VERSION_MINOR 0 -#endif -#ifndef VERSION_REVISION -#define VERSION_REVISION 0 -#endif -#ifndef VERSION_BUILD -#define VERSION_BUILD 9999 -#endif -#ifndef VERSION_PREFIX -#define VERSION_PREFIX "Dev-" -#endif -#ifndef VERSION_BUILD_YEAR -#define VERSION_BUILD_YEAR 2022 -#endif - -#ifndef GIT_REVISION -#define GIT_REVISION "" -#endif -#ifndef GIT_REVISION_SHORT -#define GIT_REVISION_SHORT "" -#endif -#ifndef GIT_DIRTY -#define GIT_DIRTY "" -#endif -#ifndef GIT_VERSION -#define GIT_VERSION "Unknown" -#endif - -#define VER_FILE_DESCRIPTION_STR "Project64" -#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD -#define VER_FILE_VERSION_STR VERSION_PREFIX STRINGIZE(VERSION_MAJOR) \ - "." STRINGIZE(VERSION_MINOR) \ - "." STRINGIZE(VERSION_REVISION) \ - "." STRINGIZE(VERSION_BUILD) \ - "-" GIT_VERSION - -#define VER_PRODUCTNAME_STR "Project64" -#define VER_PRODUCT_VERSION VER_FILE_VERSION -#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR -#define VER_ORIGINAL_FILENAME_STR VER_PRODUCTNAME_STR ".exe" -#define VER_INTERNAL_NAME_STR VER_PRODUCTNAME_STR -#define VER_COPYRIGHT_STR "Copyright (C) " STRINGIZE(VERSION_BUILD_YEAR) - -#ifdef _DEBUG -#define VER_VER_DEBUG VS_FF_DEBUG -#else -#define VER_VER_DEBUG 0 -#endif - -#define VER_FILEOS VOS_NT_WINDOWS32 -#define VER_FILEFLAGS VER_VER_DEBUG -#define VER_FILETYPE VFT_APP