Browse Source

Use node script on Linux build, up the number of make jobs

JoshEngebretson 10 years ago
parent
commit
776249e443
2 changed files with 6 additions and 8 deletions
  1. 3 3
      Build/Scripts/BuildLinux.js
  2. 3 5
      Build_AtomicEditor.sh

+ 3 - 3
Build/Scripts/BuildLinux.js

@@ -28,9 +28,9 @@ task('atomiceditor', {
 
 
   var cmds = [];
   var cmds = [];
 
 
-  cmds.push("cmake ../../../ -DATOMIC_DEV_BUILD=0 -DCMAKE_BUILD_TYPE=Release -DATOMIC_BUILD_2D=0 -DLINUX=1 ");
-  cmds.push("make GenerateScriptBindings")
-  cmds.push("make AtomicEditor AtomicPlayer")
+  cmds.push("cmake ../../../ -DATOMIC_DEV_BUILD=0 -DCMAKE_BUILD_TYPE=Release");
+  cmds.push("make -j4 GenerateScriptBindings")
+  cmds.push("make -j4 AtomicEditor AtomicPlayer")
 
 
   jake.exec(cmds, function() {
   jake.exec(cmds, function() {
 
 

+ 3 - 5
Build_AtomicEditor.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env sh
 #!/usr/bin/env sh
 
 
 if [ "$(uname)" = "Darwin" ]; then
 if [ "$(uname)" = "Darwin" ]; then
-	./Build/Mac/node/node ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor  
+	./Build/Mac/node/node ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor
 elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then
 elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then
-	node ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor
+	./Build/Linux/node/node ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor
 elif [ "$(expr substr $(uname -s) 1 7)" = "MSYS_NT" ]; then
 elif [ "$(expr substr $(uname -s) 1 7)" = "MSYS_NT" ]; then
-    ./Build/Windows/node/node.exe ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor
+  ./Build/Windows/node/node.exe ./Build/node_modules/jake/bin/cli.js -f ./Build/Scripts/Bootstrap.js build:atomiceditor
 fi
 fi
-
-