Skip to content
This repository was archived by the owner on Apr 25, 2019. It is now read-only.

Commit bfeec88

Browse files
committed
Update README and compilation options
Also force installing recent version of libstdc++ on Travis-CI
1 parent 508af54 commit bfeec88

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.travis.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
language: cpp
22
sudo: false
3-
compiler:
4-
- gcc
53

64
# Cache .npm folder for faster npm install
75
cache:
86
directories:
97
- $HOME/.npm
108

11-
env:
12-
global:
13-
- GCC_VERSION="4.8"
14-
159
addons:
10+
artifacts:
11+
s3_region: "us-east-1"
12+
paths:
13+
- GDevelop/Binaries/Output/libGD.js/Release
1614
apt:
1715
sources:
1816
- ubuntu-toolchain-r-test
1917
packages:
20-
#Build dependencies:
18+
# Cmake 3+ is required by Emscripten
2119
- cmake3
22-
- g++-4.8 # Required for latest libstdc++6
20+
21+
before_install:
22+
# This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
23+
- wget -q -O libstdc++6 http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libstdc++6_5.4.0-6ubuntu1~16.04.10_amd64.deb
24+
- sudo dpkg --force-all -i libstdc++6
2325

2426
install:
2527
# Emscripten

Gruntfile.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ module.exports = function(grunt) {
7171
cmakeBinary +
7272
' ' +
7373
cmakeArgs +
74-
' ../.. -DCMAKE_TOOLCHAIN_FILE="' +
75-
cmakeToolchainpath +
76-
'" -DFULL_VERSION_NUMBER=FALSE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
74+
' ../.. -DFULL_VERSION_NUMBER=FALSE',
7775
options: {
7876
execOptions: {
7977
cwd: buildPath,

Readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ How to build
1616
git clone https://github.com/juj/emsdk.git
1717
cd emsdk
1818
./emsdk update
19-
./emsdk install latest
20-
./emsdk activate latest
19+
./emsdk install sdk-1.37.37-64bit
20+
./emsdk activate sdk-1.37.37-64bit
2121
source ./emsdk_env.sh
2222
```
2323

@@ -29,11 +29,11 @@ source ./emsdk_env.sh
2929
npm install -g grunt-cli
3030
```
3131

32-
* Clone [GDevelop repository](https://github.com/4ian/GD) and this repository at the root of GD repository:
32+
* Clone [GDevelop repository](https://github.com/4ian/GDevelop) and this repository at the root of GD repository:
3333

3434
```shell
35-
git clone https://github.com/4ian/GD.git
36-
cd GD && git clone https://github.com/4ian/GDevelop.js.git
35+
git clone https://github.com/4ian/GDevelop.git
36+
cd GDevelop && git clone https://github.com/4ian/GDevelop.js.git
3737
```
3838

3939
* Launch the build:

0 commit comments

Comments
 (0)