Browse Source

On Windows, build AtomicTool when generating the solution

JoshEngebretson 10 years ago
parent
commit
7c447361ac

+ 3 - 1
Build/Scripts/BuildCommon.js

@@ -10,6 +10,8 @@ namespace('build', function() {
     async: true
   }, function(platform) {
 
+        process.chdir(atomicRoot);
+
         var modules = host.getScriptModules(platform);
         var bindCmd = host.atomicTool + " bind \"" + atomicRoot + "\" ";
 
@@ -18,7 +20,7 @@ namespace('build', function() {
             cmds.push(bindCmd + "Script/Packages/" + pkgName + "/ " + platform);
         }
 
-        // Compile the Editor Scripts        
+        // Compile the Editor Scripts
         if (os.platform() == "win32")
           cmds.push(atomicRoot + "Build/Windows/node/node.exe " + atomicRoot + "Build/TypeScript/tsc.js -p " + atomicRoot + "Script");
         else if (os.platform() == "darwin")

+ 7 - 2
Build/Scripts/BuildWindows.js

@@ -86,10 +86,15 @@ namespace('build', function() {
 
     jake.exec(cmds, function() {
 
-      console.log("\n\nVisual Studio Solution generated in ", slnRoot);
+      var task = jake.Task['build:genscripts']
 
-      complete();
+      task.addListener('complete', function () {
+          console.log("\n\nVisual Studio Solution generated in ", slnRoot);
+          complete();
+        });
 
+      task.invoke();
+      
     }, {
       printStdout: true
     });

+ 1 - 0
Build/Scripts/Windows/GenerateVS2015.bat

@@ -1,2 +1,3 @@
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
 cmake ..\\AtomicGameEngine -DATOMIC_DEV_BUILD=1 -G "Visual Studio 14 2015 Win64"
+msbuild Atomic.sln /m /p:Configuration=Debug /p:Platform=x64 /t:AtomicTool