From 41e0335754b43489fd526c35726f0b03815b04c1 Mon Sep 17 00:00:00 2001 From: otavepto <153766569+otavepto@users.noreply.github.com> Date: Wed, 29 May 2024 22:08:04 +0300 Subject: [PATCH] fix running help page without _ACTION target --- premake5-deps.lua | 4 ++-- premake5.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/premake5-deps.lua b/premake5-deps.lua index af6b3b59..007fc032 100644 --- a/premake5-deps.lua +++ b/premake5-deps.lua @@ -467,7 +467,7 @@ end local zlib_name = '' -- name -if os.target() == 'windows' then +if _ACTION and os.target() == 'windows' then if string.match(_ACTION, 'vs.+') then zlib_name = 'zlibstatic' elseif string.match(_ACTION, 'gmake.*') then @@ -479,7 +479,7 @@ else -- linux or macos zlib_name = 'libz' end -- extension -if string.match(_ACTION, 'vs.+') then +if _ACTION and string.match(_ACTION, 'vs.+') then zlib_name = zlib_name .. '.lib' else zlib_name = zlib_name .. '.a' diff --git a/premake5.lua b/premake5.lua index 2db00b17..ebcc0208 100644 --- a/premake5.lua +++ b/premake5.lua @@ -221,7 +221,7 @@ local lib_prefix = 'lib' local mingw_whole_archive = '' -- MinGW on Windows adds this prefix by default and linking ex: '-lssq' will look for 'libssq' -- so we have to ommit this prefix since it's automatically added -if string.match(_ACTION, 'gmake.*') then +if _ACTION and string.match(_ACTION, 'gmake.*') then lib_prefix = '' mingw_whole_archive = ':whole_archive' end @@ -268,7 +268,7 @@ local overlay_link_linux = { --------- local x32_ssq_libdir = path.join(deps_dir, "libssq/build32") local x64_ssq_libdir = path.join(deps_dir, "libssq/build64") -if string.match(_ACTION, 'vs.+') then +if _ACTION and string.match(_ACTION, 'vs.+') then x32_ssq_libdir = x32_ssq_libdir .. "/Release" x64_ssq_libdir = x64_ssq_libdir .. "/Release" end