diff --git a/Directory.Build.targets b/Directory.Build.targets index 11c967860..b5e5851e6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -22,6 +22,7 @@ GIT_REVISION=$(GitRevision); GIT_REVISION_SHORT=$(GitRevisionShort); + GIT_VERSION=$(GitVersion); VERSION_BUILD=$(GitRevisionCount); VERSION_BUILD_YEAR=$([System.DateTime]::Now.ToString(`yyyy`)) @@ -37,14 +38,14 @@ %(PreprocessorDefinitions); - $(GitPreprocessorDefinitions) + $(GitPreprocessorDefinitions); %(PreprocessorDefinitions); - $(GitPreprocessorDefinitions) - + $(GitPreprocessorDefinitions); + diff --git a/Source/Project64-audio/Project64-audio.rc b/Source/Project64-audio/Project64-audio.rc index 58080c98c..a7d0ce218 100644 --- a/Source/Project64-audio/Project64-audio.rc +++ b/Source/Project64-audio/Project64-audio.rc @@ -2,6 +2,7 @@ // #include "resource.h" #include "Version.h" +#include #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/Source/Project64-audio/Version.h b/Source/Project64-audio/Version.h index 9ad5c7ba5..a26e5c198 100644 --- a/Source/Project64-audio/Version.h +++ b/Source/Project64-audio/Version.h @@ -30,7 +30,7 @@ #define GIT_DIRTY "" #endif #ifndef GIT_VERSION -#define GIT_VERSION "Unknown" +#define GIT_VERSION Unknown #endif #define VER_FILE_DESCRIPTION_STR "Project64-audio" @@ -39,7 +39,7 @@ "." STRINGIZE(VERSION_MINOR) \ "." STRINGIZE(VERSION_REVISION) \ "." STRINGIZE(VERSION_BUILD) \ - "-" GIT_VERSION + "-" STRINGIZE(GIT_VERSION) #define VER_PRODUCTNAME_STR "Project64-audio" #define VER_PRODUCT_VERSION VER_FILE_VERSION