Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .docker/core-wasm.bake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ FROM ghcr.io/euro-office/emsdk:5.0.4 AS core-wasm
# hash wasm has one dependency in sdkjs which we must copy here (TODO: fix this)
COPY sdkjs/common/stringserialize.js /sdkjs/common/stringserialize.js


RUN --mount=type=cache,id=wasm-build-cache-${CACHE_BUST},target=/build-cache-wasm \
--mount=type=cache,id=wasm-ccache,target=/ccache \
--mount=type=cache,id=wasm-em-cache,target=/em-cache \
Expand Down
2 changes: 2 additions & 0 deletions .docker/core.bake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ FROM vcpkg-${NUGET_CACHE} AS core-base
python3-httplib2 \
lsb-release autoconf automake libtool findutils \
gn \
mdbtools-dev \
#&& curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc \
# | gpg --dearmor -o /etc/apt/keyrings/kitware.gpg \
#&& echo "deb [signed-by=/etc/apt/keyrings/kitware.gpg] https://apt.kitware.com/ubuntu/ noble main" \
Expand Down Expand Up @@ -147,6 +148,7 @@ FROM core-base AS core
-DVCPKG_MANIFEST_MODE=ON \
-DVCPKG_MANIFEST_DIR=/core \
-DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
-DVCPKG_OVERLAY_PORTS=/core/Common/3dParty \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS_RELEASE="-O3 -w" \
-DCMAKE_C_FLAGS_RELEASE="-O3 -w" \
Expand Down
67 changes: 0 additions & 67 deletions .docker/third-party.bake.Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion Common/3dParty/cef/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("${CMAKE_CURRENT_LIST_DIR}/../../../common.cmake")
set(VCPKG_BINARY_REMOTE "https://cloud.nextcloud.com/public.php/dav/files/n9KYBcFYyLLCgEw")

# 1. Setup hashes for each architecture (Vcpkg requires these)
set(CEF_HASH "NOTFOUND")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index a8618452794..4ab368a4149 100644
defines = []
cflags = []
+ if (!is_win) {
+ cflags += ["-include", "cstdint"]
+ cflags += ["-include", "cstdint", "-Wno-enum-constexpr-conversion"]
+ }
ldflags = []

Expand Down
Loading