From 7bf59f16d06de650794aaf65d7609401406cd115 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Thu, 23 May 2024 02:44:11 +0300 Subject: [PATCH] reduce duplication when defining dos_stub tool, turns out tokens are expanded during project generation! (read the docs) --- premake5.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/premake5.lua b/premake5.lua index 0129e088..3d7a8cdf 100644 --- a/premake5.lua +++ b/premake5.lua @@ -410,17 +410,13 @@ filter {} -- reset the filter and remove all active keywords --------- if os.target() == "windows" then -local dos_stub_exe_32 = os.realpath('resources/win/file_dos_stub/file_dos_stub_32.exe') -local dos_stub_exe_64 = os.realpath('resources/win/file_dos_stub/file_dos_stub_64.exe') +-- token expansion like '%{cfg.platform}' happens later during project build +local dos_stub_exe = os.realpath('resources/win/file_dos_stub/file_dos_stub_%{cfg.platform}.exe') local signer_tool = os.realpath('third-party/build/win/cert/sign_helper.bat') -- change dos stub -filter { "system:windows", "platforms:x32", "options:dosstub", } +filter { "system:windows", "options:dosstub", } postbuildcommands { - '"' .. dos_stub_exe_32 .. '" %[%{!cfg.buildtarget.abspath}]', - } -filter { "system:windows", "platforms:x64", "options:dosstub", } - postbuildcommands { - '"' .. dos_stub_exe_64 .. '" %[%{!cfg.buildtarget.abspath}]', + '"' .. dos_stub_exe .. '" %[%{!cfg.buildtarget.abspath}]', } -- sign filter { "system:windows", "options:winsign", }