Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-30 14:25:36 +08:00
Code Issues 1 Projects Releases Wiki Activity

fix running help page without _ACTION target

Browse Source
This commit is contained in:
otavepto 2024-05-29 22:08:04 +03:00
parent 96c8c1a807
commit 41e0335754
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
premake5-deps.lua
View File

@ -467,7 +467,7 @@ end
local zlib_name = '' local zlib_name = ''
-- name -- name
if os.target() == 'windows' then if _ACTION and os.target() == 'windows' then
if string.match(_ACTION, 'vs.+') then if string.match(_ACTION, 'vs.+') then
zlib_name = 'zlibstatic' zlib_name = 'zlibstatic'
elseif string.match(_ACTION, 'gmake.*') then elseif string.match(_ACTION, 'gmake.*') then
@ -479,7 +479,7 @@ else -- linux or macos
zlib_name = 'libz' zlib_name = 'libz'
end end
-- extension -- extension
if string.match(_ACTION, 'vs.+') then if _ACTION and string.match(_ACTION, 'vs.+') then
zlib_name = zlib_name .. '.lib' zlib_name = zlib_name .. '.lib'
else else
zlib_name = zlib_name .. '.a' zlib_name = zlib_name .. '.a'

4
premake5.lua
View File

@ -221,7 +221,7 @@ local lib_prefix = 'lib'
local mingw_whole_archive = '' local mingw_whole_archive = ''
-- MinGW on Windows adds this prefix by default and linking ex: '-lssq' will look for 'libssq' -- 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 -- 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 = '' lib_prefix = ''
mingw_whole_archive = ':whole_archive' mingw_whole_archive = ':whole_archive'
end end
@ -268,7 +268,7 @@ local overlay_link_linux = {
--------- ---------
local x32_ssq_libdir = path.join(deps_dir, "libssq/build32") local x32_ssq_libdir = path.join(deps_dir, "libssq/build32")
local x64_ssq_libdir = path.join(deps_dir, "libssq/build64") 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" x32_ssq_libdir = x32_ssq_libdir .. "/Release"
x64_ssq_libdir = x64_ssq_libdir .. "/Release" x64_ssq_libdir = x64_ssq_libdir .. "/Release"
end end