From 47ac1796a95cc3121bc2a23f7a3da090e82a60ca Mon Sep 17 00:00:00 2001 From: Nikita Smith Date: Tue, 3 Dec 2024 11:00:18 -0800 Subject: [PATCH] use build string literal from base context --- src/linker/lnk.c | 5 ++--- src/linker/lnk_config.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/linker/lnk.c b/src/linker/lnk.c index ef04ecf1..f5f74c52 100644 --- a/src/linker/lnk.c +++ b/src/linker/lnk.c @@ -5,8 +5,7 @@ // Build Options #define BUILD_CONSOLE_INTERFACE 1 -#define BUILD_VERSION_STRING Stringify(BUILD_VERSION_MAJOR) "." Stringify(BUILD_VERSION_MINOR) "." Stringify(BUILD_VERSION_PATCH) -#define BUILD_TITLE "Epic Games Tools (R) RAD COFF/PE Linker " BUILD_VERSION_STRING " (" BUILD_GIT_HASH_FULL ")" +#define BUILD_TITLE "Epic Games Tools (R) RAD COFF/PE Linker" //////////////////////////////// @@ -611,7 +610,7 @@ lnk_add_resource_debug_s(LNK_SectionTable *st, if (exe_name_ext.size > 0) { exe_name = str8_chop(exe_name, 1); } - String8 version_string = push_str8f(scratch.arena, BUILD_TITLE); + String8 version_string = push_str8f(scratch.arena, BUILD_TITLE_STRING_LITERAL); String8 comp_data = cv_make_comp3(scratch.arena, CV_Compile3Flag_EC, CV_Language_CVTRES, arch, 0, 0, 0, 0, 1, 0, 1, 0, diff --git a/src/linker/lnk_config.c b/src/linker/lnk_config.c index e36694db..3227103c 100644 --- a/src/linker/lnk_config.c +++ b/src/linker/lnk_config.c @@ -782,7 +782,7 @@ lnk_print_build_info() fprintf(stdout, " Compiler: %s\n", COMPILER_STRING); fprintf(stdout, " Mode : %s\n", BUILD_MODE_STRING); fprintf(stdout, " Date : %s %s\n", __TIME__, __DATE__); - fprintf(stdout, " Version : %s\n", BUILD_VERSION_STRING); + fprintf(stdout, " Version : %s\n", BUILD_VERSION_STRING_LITERAL); } internal void @@ -791,7 +791,7 @@ lnk_print_help(void) Temp scratch = scratch_begin(0,0); fprintf(stdout, "--- Help -------------------------------------------------------\n"); - fprintf(stdout, " %s\n", BUILD_TITLE); + fprintf(stdout, " %s\n", BUILD_TITLE_STRING_LITERAL); fprintf(stdout, "\n"); fprintf(stdout, " Usage: rad-link.exe [Options] [Files] [@rsp]\n"); fprintf(stdout, "\n"); @@ -1680,7 +1680,7 @@ lnk_config_from_cmd_line(Arena *arena, String8List raw_cmd_line) } break; case LNK_CmdSwitch_Rad_Version: { - fprintf(stdout, "%s\n", BUILD_TITLE); + fprintf(stdout, "%s\n", BUILD_TITLE_STRING_LITERAL); os_abort(0); } break;