This commit is contained in:
proller committed 2022-11-01 05:06:24 +03:00
1 parent e2c010a378
commit 839e1d853c
4 files changed
+16 -4

No files matched your search

+3 -1
View File
@@ -35,6 +35,8 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Install deps
run: |
source ./util/ci/common.sh
@@ -215,7 +217,7 @@ jobs:
env:
VCPKG_VERSION: 5cf60186a241e84e8232641ee973395d4fde90e1
# 2022.02
vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry boost
strategy:
fail-fast: false
matrix:
+9 -1
View File
@@ -76,7 +76,15 @@ if(${CMAKE_VERSION} VERSION_LESS 3.13)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
add_link_options(-fuse-ld=lld)
include (CheckCXXSourceCompiles)
include (CMakePushCheckState)
set (TEST_FLAG "-fuse-ld=lld")
set (CMAKE_REQUIRED_FLAGS ${TEST_FLAG})
check_cxx_source_compiles(" int main() { return 0; } " HAVE_LLD)
if (HAVE_LLD)
add_link_options(-fuse-ld=lld)
endif ()
endif()
if(USE_LIBCXX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+1 -1
View File
@@ -22,7 +22,7 @@ COPY textures /usr/src/minetest/textures
WORKDIR /usr/src/minetest
RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev zstd-dev \
msgpack-c boost-dev leveldb-dev snappy-dev \
msgpack-c boost-dev leveldb-dev snappy-dev libunwind-dev libexecinfo-dev \
gmp-dev jsoncpp-dev postgresql-dev ninja luajit-dev ca-certificates && \
true
# git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \
+3 -1
View File
@@ -857,7 +857,9 @@ if(NOT CMAKE_CROSSCOMPILING)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
if (NOT NO_BIN_DIR)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
endif()
if(BUILD_CLIENT)
add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS})