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

attempt to fix CI deps build

Browse Source
This commit is contained in:
otavepto 2024-06-08 03:25:30 +03:00
parent e213a44c55
commit c9d7640da6
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/emu-deps-linux.yml vendored
View File

@ -85,4 +85,4 @@ jobs:
run: | run: |
export CMAKE_GENERATOR="Unix Makefiles" export CMAKE_GENERATOR="Unix Makefiles"
sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --verbose --clean --os=linux gmake2 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=2 --verbose --clean --os=linux gmake2

2
.github/workflows/emu-deps-win.yml vendored
View File

@ -79,4 +79,4 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
set "CMAKE_GENERATOR=Visual Studio 17 2022" set "CMAKE_GENERATOR=Visual Studio 17 2022"
"${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --verbose --clean --os=windows vs2022 "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --j=2 --verbose --clean --os=windows vs2022

15
premake5-deps.lua
View File

@ -84,6 +84,11 @@ newoption {
trigger = "all-build", trigger = "all-build",
description = "Build all deps", description = "Build all deps",
} }
newoption {
category = "build",
trigger = "j",
description = "Parallel build jobs, by default the max possible",
}
newoption { newoption {
category = "build", category = "build",
trigger = "32-build", trigger = "32-build",
@ -142,6 +147,10 @@ local function merge_list(src, dest)
end end
if _OPTIONS['j'] and not string.match(_OPTIONS['j'], '^[1-9]+$') then
error("Invalid argument for --j")
end
-- common defs -- common defs
--------- ---------
@ -325,7 +334,11 @@ local function cmake_build(dep_folder, is_32, extra_cmd_defs, c_flags_init, cxx_
end end
-- build with cmake -- build with cmake
local ok = os.execute(mycmake .. ' --build "' .. build_dir .. '" --config Release --parallel' .. verbose_build_str) local parallel_str = ' --parallel'
if _OPTIONS['j'] then
parallel_str = parallel_str .. ' ' .. _OPTIONS['j']
end
local ok = os.execute(mycmake .. ' --build "' .. build_dir .. '" --config Release' .. parallel_str .. verbose_build_str)
if not ok then if not ok then
error("failed to build") error("failed to build")
return return