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

Commit 508af54

Browse files
committed
[WIP] Update build to use emconfigure and emmake
1 parent 94f34e0 commit 508af54

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
language: cpp
22
sudo: false
3+
compiler:
4+
- gcc
35

46
# Cache .npm folder for faster npm install
57
cache:
68
directories:
79
- $HOME/.npm
810

11+
env:
12+
global:
13+
- GCC_VERSION="4.8"
14+
915
addons:
1016
apt:
1117
sources:
1218
- ubuntu-toolchain-r-test
1319
packages:
1420
#Build dependencies:
15-
- cmake
21+
- cmake3
22+
- g++-4.8 # Required for latest libstdc++6
1623

1724
install:
1825
# Emscripten
@@ -26,7 +33,7 @@ install:
2633
- npm install -g grunt-cli
2734
# GDevelop
2835
- git clone https://github.com/4ian/GDevelop.git
29-
- cd GDevelop && git clone https://github.com/4ian/GDevelop.js.git
36+
- cd GDevelop && git clone -b refactor/emscripten-build https://github.com/4ian/GDevelop.js.git
3037
- cd GDevelop.js
3138
- npm install
3239
- npm run build

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ module.exports = function(grunt) {
99
var isWin = /^win/.test(process.platform);
1010
var cmakeBinary = isWin
1111
? '"C:\\Program Files (x86)\\CMake\\bin\\cmake"'
12-
: 'cmake';
12+
: 'emconfigure cmake';
1313
var cmakeArgs = isWin ? '-G "MinGW Makefiles"' : '';
1414

15-
var makeBinary = isWin ? 'mingw32-make' : 'make';
15+
var makeBinary = isWin ? 'mingw32-make' : 'emmake make';
1616

1717
//Sanity checks
1818
var fs = require('fs');

0 commit comments

Comments
 (0)