Преглед на файлове

Mac -> Windows deployments

Josh Engebretson преди 11 години
родител
ревизия
247323dbcd
променени са 2 файла, в които са добавени 15 реда и са изтрити 0 реда
  1. 5 0
      Source/AtomicEditor/Source/Build/BuildMac.cpp
  2. 10 0
      Source/AtomicEditor/Source/Build/BuildWindows.cpp

+ 5 - 0
Source/AtomicEditor/Source/Build/BuildMac.cpp

@@ -30,7 +30,12 @@ void BuildMac::Initialize()
     Project* project = editor->GetProject();
     Project* project = editor->GetProject();
 
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    String bundleResources = fileSystem->GetProgramDir();
+#else
     String bundleResources = fileSystem->GetAppBundleResourceFolder();
     String bundleResources = fileSystem->GetAppBundleResourceFolder();
+#endif
 
 
     String projectResources = project->GetResourcePath();
     String projectResources = project->GetResourcePath();
     String dataFolder = bundleResources + "Data/";
     String dataFolder = bundleResources + "Data/";

+ 10 - 0
Source/AtomicEditor/Source/Build/BuildWindows.cpp

@@ -31,7 +31,12 @@ void BuildWindows::Initialize()
     Project* project = editor->GetProject();
     Project* project = editor->GetProject();
 
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
     String bundleResources = fileSystem->GetProgramDir();
     String bundleResources = fileSystem->GetProgramDir();
+#else
+    String bundleResources = fileSystem->GetAppBundleResourceFolder();
+#endif
 
 
     String projectResources = project->GetResourcePath();
     String projectResources = project->GetResourcePath();
     String dataFolder = bundleResources + "Data/";
     String dataFolder = bundleResources + "Data/";
@@ -52,7 +57,12 @@ void BuildWindows::Build(const String& buildPath)
     Initialize();
     Initialize();
 
 
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
     FileSystem* fileSystem = GetSubsystem<FileSystem>();
+#ifdef ATOMIC_PLATFORM_WINDOWS
     String buildSourceDir = fileSystem->GetProgramDir();
     String buildSourceDir = fileSystem->GetProgramDir();
+#else
+    String buildSourceDir = fileSystem->GetAppBundleResourceFolder();
+#endif
+
     buildSourceDir += "Deployment/Win64";
     buildSourceDir += "Deployment/Win64";
 
 
     fileSystem->CreateDir(buildPath);
     fileSystem->CreateDir(buildPath);