Commit 4f0cdaeda95d7ce0fe4d3bcd60571d8e23f3dfd9

Authored by Arthur Bikmullin
2 parents d65d58f9 757e5fa8

Merge branch 'unixmake' into 'master'

Gulp should use "make" on Unix-like systems

See merge request !1
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -34,14 +34,14 @@ if (config.path.monkey === '') {
34 34
35 35 var transcc = config.path.monkey + '/bin/transcc_' + host;
36 36 var qmake = config.path.qt + '/bin/qmake';
37   -var make = config.path.mingw + '/bin/mingw32-make';
  37 +var make = 'make';
38 38 var bin = './bin';
39 39 var makedocs = bin + '/makedocs_' + host;
40 40
41 41 if (process.platform == 'win32') {
42 42 transcc += '.exe';
43 43 qmake += '.exe';
44   - make += '.exe';
  44 + make = config.path.mingw + '/bin/mingw32-make.exe';
45 45 makedocs += '.exe';
46 46 }
47 47
... ...