diff --git a/qrenderdoc/Resources/resource.h b/qrenderdoc/Resources/resource.h index 57b9fef58..b97b0f28b 100644 --- a/qrenderdoc/Resources/resource.h +++ b/qrenderdoc/Resources/resource.h @@ -4,12 +4,6 @@ // #include "version.h" -#ifdef GIT_COMMIT_HASH_LITERAL -#define GIT_COMMIT_HASH VER_STR(GIT_COMMIT_HASH_LITERAL) -#else -#define GIT_COMMIT_HASH "NO_GIT_COMMIT_HASH_DEFINED" -#endif - // Next default values for new objects // #ifdef APSTUDIO_INVOKED diff --git a/renderdoc/api/replay/version.h b/renderdoc/api/replay/version.h index 7cb14a0c1..d5e2d1338 100644 --- a/renderdoc/api/replay/version.h +++ b/renderdoc/api/replay/version.h @@ -31,3 +31,9 @@ #define RENDERDOC_VERSION_MINOR 33 #define RENDERDOC_VERSION_STRING \ VER_STR(RENDERDOC_VERSION_MAJOR) "." VER_STR(RENDERDOC_VERSION_MINOR) + +#if defined(GIT_COMMIT_HASH_LITERAL) +#define GIT_COMMIT_HASH VER_STR(GIT_COMMIT_HASH_LITERAL) +#elif !defined(GIT_COMMIT_HASH) +#define GIT_COMMIT_HASH "NO_GIT_COMMIT_HASH_DEFINED" +#endif diff --git a/renderdoc/data/resource.h b/renderdoc/data/resource.h index bb62b6154..13f95e7d2 100644 --- a/renderdoc/data/resource.h +++ b/renderdoc/data/resource.h @@ -40,7 +40,6 @@ #define RESOURCE_glsl_deptharr2ms_frag 426 #define RESOURCE_glsl_depthms2arr_frag 427 -#define GIT_COMMIT_HASH "NO_GIT_COMMIT_HASH_DEFINED" //#define RENDERDOC_OFFICIAL_BUILD // used to determine whether to submit auto crash reports // Next default values for new objects diff --git a/renderdoccmd/resource.h b/renderdoccmd/resource.h index da468673e..9c8e4c9f4 100644 Binary files a/renderdoccmd/resource.h and b/renderdoccmd/resource.h differ diff --git a/scripts/hash_version.sh b/scripts/hash_version.sh index 9b686d035..b2626fbb4 100644 --- a/scripts/hash_version.sh +++ b/scripts/hash_version.sh @@ -9,8 +9,6 @@ fi GIT_HASH=`git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED`; rm -f ver -sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/data/resource.h > ver && mv ver renderdoc/data/resource.h -sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" qrenderdoc/Resources/resource.h > ver && mv ver qrenderdoc/Resources/resource.h -sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoccmd/resource.h > ver && mv ver renderdoccmd/resource.h +sed "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/api/replay/version > ver && mv ver renderdoc/data/resource.h sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdocui/Properties/AssemblyInfo.cs > ver && mv ver renderdocui/Properties/AssemblyInfo.cs rm -f ver