Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 08:24:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #847 from thewtex/emscripten-3-1-64

Browse Source 
Update emscripten to 3.1.64 and cmake_minimum_required to 3.16
This commit is contained in:
Jonas Vautherin 2024-08-09 06:23:21 +02:00 committed by GitHub
commit 3603d82802
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/run.py
View File

@ -44,7 +44,7 @@ def test_cmake_build_system(build_dir, language, source, emulator, linker_flags,
print('Building ' + source + ' with CMake...') print('Building ' + source + ' with CMake...')
with open('CMakeLists.txt', 'w') as fp: with open('CMakeLists.txt', 'w') as fp:
fp.write('cmake_minimum_required(VERSION 3.0)\n') fp.write('cmake_minimum_required(VERSION 3.16)\n')
fp.write('project(test-compiler)\n') fp.write('project(test-compiler)\n')
fp.write('add_executable(a.out ' + os.path.basename(source) + ')\n') fp.write('add_executable(a.out ' + os.path.basename(source) + ')\n')
if emulator: if emulator:

2
web-wasm/Dockerfile.in
View File

@ -1,4 +1,4 @@
ARG DOCKER_IMAGE_VERSION=3.1.60 ARG DOCKER_IMAGE_VERSION=3.1.64
FROM emscripten/emsdk:$DOCKER_IMAGE_VERSION FROM emscripten/emsdk:$DOCKER_IMAGE_VERSION
LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"