From 6812670cc8238ef7d9fbbc20c8723ec2a4710382 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 29 Mar 2021 18:28:15 -0400 Subject: [PATCH] Use _SYS_STR for version info --- version.h.in | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/version.h.in b/version.h.in index a1def4cb4..866d3908a 100644 --- a/version.h.in +++ b/version.h.in @@ -1,17 +1,25 @@ #ifndef VERSION_H #define VERSION_H -#define URDE_WC_DESCRIBE "@URDE_WC_DESCRIBE@" -#define URDE_VERSION_STRING "@URDE_VERISON_STRING@" +#ifndef _SYS_STR +#ifdef _WIN32 +#define _SYS_STR(val) L##val +#else +#define _SYS_STR(val) val +#endif +#endif -#define URDE_WC_BRANCH "@URDE_WC_BRANCH@" -#define URDE_WC_REVISION "@URDE_WC_REVISION@" -#define URDE_WC_DATE "@URDE_WC_DATE@" +#define URDE_WC_DESCRIBE _SYS_STR("@URDE_WC_DESCRIBE@") +#define URDE_VERSION_STRING _SYS_STR("@URDE_VERISON_STRING@") + +#define URDE_WC_BRANCH _SYS_STR("@URDE_WC_BRANCH@") +#define URDE_WC_REVISION _SYS_STR("@URDE_WC_REVISION@") +#define URDE_WC_DATE _SYS_STR("@URDE_WC_DATE@") #if defined(__x86_64__) || defined(_M_AMD64) -#define URDE_DLPACKAGE "urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-x86_64-@URDE_VECTOR_ISA@" +#define URDE_DLPACKAGE _SYS_STR("urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-x86_64-@URDE_VECTOR_ISA@") #elif defined(__aarch64__) || defined(_M_ARM64) -#define URDE_DLPACKAGE "urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-arm64" +#define URDE_DLPACKAGE _SYS_STR("urde-@URDE_WC_DESCRIBE@-@PLATFORM_NAME@-arm64") #endif #endif