Browse Source

Merge pull request #657 from AtomicGameEngine/JME-ATOMIC-FIXENGINESETTINGS

Only copy Engine settings if they exist, otherwise build fails
JoshEngebretson 9 years ago
parent
commit
94563a1436
1 changed files with 7 additions and 2 deletions
  1. 7 2
      Source/ToolCore/Build/BuildWindows.cpp

+ 7 - 2
Source/ToolCore/Build/BuildWindows.cpp

@@ -155,8 +155,13 @@ void BuildWindows::Build(const String& buildPath)
     if (!BuildCreateDirectory(buildPath_ + "/Settings"))
     if (!BuildCreateDirectory(buildPath_ + "/Settings"))
         return;
         return;
 
 
-    if (!BuildCopyFile(GetSettingsDirectory() + "/Engine.json", buildPath_ + "/Settings/Engine.json"))
-        return;
+    String engineJSON(GetSettingsDirectory() + "/Engine.json");
+
+    if (fileSystem->FileExists(engineJSON))
+    {
+        if (!BuildCopyFile(engineJSON, buildPath_ + "/Settings/Engine.json"))
+            return;
+    }
 
 
     if (!BuildCopyFile(playerBinary, buildPath_ + "/AtomicPlayer.exe"))
     if (!BuildCopyFile(playerBinary, buildPath_ + "/AtomicPlayer.exe"))
         return;
         return;