lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some of the redundant places where git commit hash is #define'd

Browse Source
This commit is contained in:
baldurk
2017-02-15 10:42:04 +00:00
parent 845450848a
commit 71c05ed572
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Resources/resource.h
-6
View File
@@ -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
renderdoc/api/replay/version.h
+6
View File
@@ -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
renderdoc/data/resource.h
-1
View File
@@ -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
renderdoccmd/resource.h
BIN
View File
Binary file not shown.
scripts/hash_version.sh
+1 -3
View File
@@ -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