Browse Source

Local builds with Android deployment on OSX

Josh Engebretson 10 years ago
parent
commit
b216618602
2 changed files with 11 additions and 4 deletions
  1. 10 3
      Build/Scripts/BuildAndroid.js
  2. 1 1
      Source/AtomicPlayer/Application/AtomicPlayer.cpp

+ 10 - 3
Build/Scripts/BuildAndroid.js

@@ -1,10 +1,10 @@
 var fs = require('fs-extra');
 var path = require("path");
 var host = require("./Host");
+var os = require('os');
 var atomicRoot = host.atomicRoot;
 
 var buildDir = host.artifactsRoot + "Build/Android/";
-var editorAppFolder = host.artifactsRoot + "AtomicEditor/";
 
 namespace('build', function() {
 
@@ -27,11 +27,18 @@ namespace('build', function() {
       cmds.push(bindCmd + "Script/Packages/" + pkgName + "/ ANDROID")
     }
 
-    // Build the Android Player
-    cmds.push(atomicRoot + "Build/Scripts/Windows/CompileAndroid.bat");
+    if (os.platform() == "win32") {
+      cmds.push(atomicRoot + "Build/Scripts/Windows/CompileAndroid.bat");
+    }
+    else {
+      cmds.push("cmake -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=../../../Build/CMake/Toolchains/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release ../../../");
+      cmds.push("make -j4");
+    }
 
     jake.exec(cmds, function() {
 
+      var editorAppFolder = host.artifactsRoot + (os.platform() == "win32" ? "AtomicEditor/" : "AtomicEditor/AtomicEditor.app/");
+
       // Install Deployment
       fs.copySync(buildDir + "Source/AtomicPlayer/Application/libAtomicPlayer.so",
         editorAppFolder + "Resources/ToolData/Deployment/Android/libs/armeabi-v7a/libAtomicPlayer.so");

+ 1 - 1
Source/AtomicPlayer/Application/AtomicPlayer.cpp

@@ -78,7 +78,7 @@ void AtomicPlayerApp::Setup()
 
 #if (ATOMIC_PLATFORM_ANDROID)
     engineParameters_["FullScreen"] = true;
-    engineParameters_["ResourcePaths"] = "CoreData;PlayerData;AtomicResources";
+    engineParameters_["ResourcePaths"] = "CoreData;PlayerData;Cache;AtomicResources";
 #elif ATOMIC_PLATFORM_WEB
     engineParameters_["FullScreen"] = false;
     engineParameters_["ResourcePaths"] = "AtomicResources";