فهرست منبع

AtomicTool may be run out of source tree, so don't include any Resource dirs

Josh Engebretson 10 سال پیش
والد
کامیت
fc08fe2c06
3فایلهای تغییر یافته به همراه3 افزوده شده و 11 حذف شده
  1. 2 2
      Build/Scripts/BuildAndroid.js
  2. 1 5
      Source/AtomicTool/AtomicTool.cpp
  3. 0 4
      Source/ToolCore/Command/BindCmd.cpp

+ 2 - 2
Build/Scripts/BuildAndroid.js

@@ -27,11 +27,11 @@ namespace('build', function() {
 
     jake.exec(cmds, function() {
 
-      console.log("Built Android Player");
-
       var androidPlayerBinary = playerBuildDir + "Source/AtomicPlayer/Application/libAtomicPlayer.so";
       fs.copySync(androidPlayerBinary, buildDir + "Bin/libAtomicPlayer.so");
 
+      console.log("Built Android Player");
+
       complete();
 
     }, {

+ 1 - 5
Source/AtomicTool/AtomicTool.cpp

@@ -77,7 +77,7 @@ void AtomicTool::Setup()
     engineParameters_["Headless"] = true;
     engineParameters_["LogLevel"] = LOG_INFO;
 
-    // no default resources (will be initialized later)
+    // no default resources, AtomicTool may be run outside of source tree
     engineParameters_["ResourcePaths"] = "";
 }
 
@@ -220,10 +220,6 @@ void AtomicTool::Start()
 
 //#endif
 
-    ResourceCache* cache = GetSubsystem<ResourceCache>();
-    cache->AddResourceDir(env->GetCoreDataDir());
-    cache->AddResourceDir(env->GetPlayerDataDir());
-
     tsystem->SetCLI();
     tsystem->SetDataPath(cliDataPath_);
 

+ 0 - 4
Source/ToolCore/Command/BindCmd.cpp

@@ -68,10 +68,6 @@ bool BindCmd::Parse(const Vector<String>& arguments, unsigned startIndex, String
 
 void BindCmd::Run()
 {
-    ToolEnvironment* env = GetSubsystem<ToolEnvironment>();
-
-    sourceRootFolder_ = env->GetRootSourceDir();
-
     SharedPtr<JSBind> jsbind(new JSBind(context_));
 
     context_->RegisterSubsystem(jsbind);