trying again
This commit is contained in:
parent
aa1d559854
commit
32f6d28d05
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@ -89,10 +89,10 @@ jobs:
|
||||
|
||||
build_linux:
|
||||
name: Build OpenStarbound Linux x86_64
|
||||
runs-on: ubuntu-20.04
|
||||
#env:
|
||||
# CC: clang
|
||||
# CXX: clang++
|
||||
runs-on: ubuntu-22.04
|
||||
env:
|
||||
CC: clang
|
||||
CXX: clang++
|
||||
|
||||
steps:
|
||||
- name: Install Packages
|
||||
|
@ -47,6 +47,8 @@
|
||||
"binaryDir": "${sourceParentDir}/build/linux-release",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_C_COMPILER": "clang",
|
||||
"CMAKE_CXX_COMPILER": "clang++",
|
||||
"VCPKG_TARGET_TRIPLET": "x64-linux-mixed",
|
||||
"CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include",
|
||||
"CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux",
|
||||
|
@ -3,7 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
|
||||
# set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
|
||||
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
|
||||
|
||||
if(PORT MATCHES "discord-")
|
||||
set(VCPKG_LIBRARY_LINKAGE dynamic)
|
||||
|
Loading…
x
Reference in New Issue
Block a user