Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Upgrade to Emscripten 3.1.66 #6942

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] Upgrade to Emscripten 3.1.66 #6942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e95d208
Upgrade to Emscripten 3.1.66
4ian Sep 10, 2024
b9aef05
Upgrade RapidJSON to latest master commit
4ian Sep 10, 2024
017d993
Try to fix Emscripten build
4ian Sep 10, 2024
8602c8e
Upgrade Travis Ubuntu version
4ian Sep 10, 2024
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- run:
name: Install Emscripten (for GDevelop.js)
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..

# GDevelop.js dependencies
- restore_cache:
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:

- run:
name: Install Emscripten (for GDevelop.js)
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..

- run:
name: Install system dependencies for Electron builder
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:

- run:
name: Install Emscripten (for GDevelop.js)
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..

# GDevelop.js dependencies
- restore_cache:
Expand Down
6 changes: 3 additions & 3 deletions .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a configuration file allowing to quickly set up a development environment
# on GitPod (https://www.gitpod.io/).
# Also check GitHub codespaces if you're interested in working
# Also check GitHub codespaces if you're interested in working
# on a remote development server.

# This works well for:
Expand All @@ -12,9 +12,9 @@
tasks:
- name: Install dependencies for Emscripten and build GDevelop.js
init: |
sudo apt-get update
sudo apt-get update
sudo apt install cmake python-is-python3 python3-distutils -y
git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
cd GDevelop.js
npm install
source ../emsdk/emsdk_env.sh && npm run build -- --dev
Expand Down
14 changes: 4 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

language: cpp
sudo: false
dist: jammy
compiler:
- clang

Expand All @@ -16,21 +17,14 @@ cache:

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
# Build dependencies:
- cmake
- p7zip-full

before_install:
# This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
- wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.12_amd64.deb
- sudo dpkg --force-all -i libstdc++6

install:
# Ensure we use a recent version of Node.js (and npm).
- nvm install v16 && nvm use v16
- nvm install v18 && nvm use v18
#Compile the tests only for GDCore
- mkdir .build-tests
- cd .build-tests
Expand All @@ -39,8 +33,8 @@ install:
- cd ..
# Install Emscripten (for GDevelop.js)
# Specify the tag for the core repository to avois breaking changes.
- git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
- cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
- git clone --depth 1 --branch 3.1.66 https://github.com/juj/emsdk.git
- cd emsdk && ./emsdk install 3.1.66 && ./emsdk activate 3.1.66 && cd ..
# Install GDevelop.js dependencies
- cd GDevelop.js && npm install && cd ..
# Build GDevelop.js
Expand Down
2 changes: 1 addition & 1 deletion Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ else()
add_library(GDCore SHARED ${source_files})
endif()
if(EMSCRIPTEN)
set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
# set_target_properties(GDCore PROPERTIES SUFFIX ".bc")
elseif(WIN32)
set_target_properties(GDCore PROPERTIES PREFIX "")
else()
Expand Down
1 change: 1 addition & 0 deletions Core/GDCore/Serialization/rapidjson/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is the RapidJSON library as of commit 7c73dd7de7c4f14379b781418c6e947ad464c818 (https://github.com/Tencent/rapidjson/commit/7c73dd7de7c4f14379b781418c6e947ad464c818).
Loading
Loading