Browse Source

x64 tweaks

JoshEngebretson 10 years ago
parent
commit
a9d78bd989
2 changed files with 5 additions and 3 deletions
  1. 4 2
      Jakefile
  2. 1 1
      Source/ToolCore/ToolEnvironment.cpp

+ 4 - 2
Jakefile

@@ -35,6 +35,7 @@ var iosDeployBuildFolder = artifactsFolder + "/ios-deploy";
 var webBuildFolder = artifactsFolder + "/Web_Build";
 var linuxBuildFolder = artifactsFolder + "/Linux_Build";
 var jsDocFolder = artifactsFolder + "/JSDoc";
+var atomicNETFolder = artifactsFolder + "/AtomicNET";
 
 // binaries
 
@@ -62,7 +63,8 @@ var allBuildFolders = [
   iosDeployBuildFolder,
   webBuildFolder,
   linuxBuildFolder,
-  jsDocFolder
+  jsDocFolder,
+  atomicNETFolder
 ];
 
 // packaging
@@ -217,7 +219,7 @@ namespace('build', function() {
     } else if (host == "win32") {
 
       if (deployments.windows) {
-        fs.copySync(platformBinariesFolder + "/Win32/AtomicPlayer.exe", deployRoot + "/Windows/x86/AtomicPlayer.exe");
+        fs.copySync(platformBinariesFolder + "/Win32/AtomicPlayer.exe", deployRoot + "/Windows/x64/AtomicPlayer.exe");
       }
 
     }

+ 1 - 1
Source/ToolCore/ToolEnvironment.cpp

@@ -49,7 +49,7 @@ bool ToolEnvironment::InitFromPackage()
 
     //TODO: move this to deployment stuff
     playerAppFolder_ = resourcesDir + "ToolData/Deployment/MacOS/AtomicPlayer.app/";
-    playerBinary_ = resourcesDir + "ToolData/Deployment/Windows/x86/AtomicPlayer.exe";
+    playerBinary_ = resourcesDir + "ToolData/Deployment/Windows/x64/AtomicPlayer.exe";
 
     resourceCoreDataDir_ = resourcesDir + "CoreData";
     resourcePlayerDataDir_ = resourcesDir + "PlayerData";