xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2025-12-06 07:12:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[build] Fix Linux CI

Browse source 
This changes the Gnumake build to CMake + Ninja builds in order to fix linker issues in the CI.
This commit is contained in:
Marco Rodolfi 2025-01-20 18:08:15 +01:00 committed by Radosław Gliński
parent 08537f0a80
commit 00202f938d
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/Linux_build.yml vendored
View file

@ -71,7 +71,7 @@ jobs:
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
sudo apt-add-repository "deb http://apt.llvm.org/${UBUNTU_BASE}/ llvm-toolchain-${UBUNTU_BASE}-$LLVM_VERSION main" sudo apt-add-repository "deb http://apt.llvm.org/${UBUNTU_BASE}/ llvm-toolchain-${UBUNTU_BASE}-$LLVM_VERSION main"
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install mesa-vulkan-drivers valgrind libc++-dev libc++abi-dev libgtk-3-dev libsdl2-dev libvulkan-dev libx11-dev libx11-xcb-dev clang-$LLVM_VERSION clang-format-$LLVM_VERSION llvm-$LLVM_VERSION sudo apt-get -y install mesa-vulkan-drivers valgrind libc++-dev libc++abi-dev libgtk-3-dev libsdl2-dev libvulkan-dev libx11-dev libx11-xcb-dev clang-$LLVM_VERSION clang-format-$LLVM_VERSION llvm-$LLVM_VERSION ninja-build cmake
./xb setup ./xb setup
- name: Build - name: Build
run: ./xb build --config=Release run: ./xb build --config=Release

31
xenia-build
View file

@ -533,7 +533,7 @@ def run_platform_premake(target_os_override=None, cc='clang', devenv=None):
elif target_os == 'android': elif target_os == 'android':
devenv = 'androidndk' devenv = 'androidndk'
else: else:
devenv = 'gmake2' devenv = 'cmake'
if target_os != 'linux': if target_os != 'linux':
cc = None cc = None
return run_premake(target_os=target_os, action=devenv, cc=cc) return run_premake(target_os=target_os, action=devenv, cc=cc)
@ -850,15 +850,26 @@ class BaseBuildCommand(Command):
] + scheme_args + pass_args, shell=False, env=dict(os.environ)) ] + scheme_args + pass_args, shell=False, env=dict(os.environ))
else: else:
result = subprocess.call([ result = subprocess.call([
'make', 'cmake',
'-j' if threads == 0 else '-j%d' % threads, '-S build/',
'-Cbuild/', '-B build/build_%s' % (args['config']),
'config=%s_linux' % (args['config']), '-DCMAKE_BUILD_TYPE=%s' % (args['config'].title()),
] + pass_args + args['target'], shell=False, env=dict(os.environ)) '-DCMAKE_C_COMPILER=clang',
print('') '-DCMAKE_CXX_COMPILER=clang++',
if result != 0: '-G Ninja'
print('ERROR: build failed with one or more errors.') ] + pass_args, shell=False, env=dict(os.environ))
return result print('')
if result != 0:
print('ERROR: cmake failed with one or more errors.')
return result
result = subprocess.call([
'ninja',
'-C./build/build_%s' % (args['config']),
'-j' if threads == 0 else '-j%d' % threads,
] + pass_args, shell=False, env=dict(os.environ))
if result != 0:
print('ERROR: ninja failed with one or more errors.')
return result
return 0 return 0