Browse Source

Merge pull request #1614 from AtomicGameEngine/JME-ATOMIC-1595

Disable imgui file creation by default.
JoshEngebretson 8 years ago
parent
commit
910ea0c624
2 changed files with 8 additions and 3 deletions
  1. 3 1
      Build/Scripts/BuildCommon.js
  2. 5 2
      Source/ThirdParty/imgui/imgui.cpp

+ 3 - 1
Build/Scripts/BuildCommon.js

@@ -168,8 +168,10 @@ namespace('build', function() {
             var lintTask = jake.Task['build:lint_typescript'];
 
             lintTask.addListener('complete', function () {
+
                 console.log("\n\nLint: Typescript linting complete.\n\n");
-                jake.exec(cmds, function() {
+
+                jake.exec(cmds, { printStdout : true, printStderr: true }, function() {
 
                     // copy some external dependencies into the editor modules directory
                     var editorModulesDir = "./Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts/AtomicEditor/modules";

+ 5 - 2
Source/ThirdParty/imgui/imgui.cpp

@@ -821,8 +821,11 @@ ImGuiIO::ImGuiIO()
     DisplaySize = ImVec2(-1.0f, -1.0f);
     DeltaTime = 1.0f/60.0f;
     IniSavingRate = 5.0f;
-    IniFilename = "imgui.ini";
-    LogFilename = "imgui_log.txt";
+    // ATOMIC BEGIN
+    // Don't use imgui ini or log by default
+    IniFilename = 0; // "imgui.ini";
+    LogFilename = 0; // "imgui_log.txt";
+    // ATOMIC END
     Fonts = &GImDefaultFontAtlas;
     FontGlobalScale = 1.0f;
     FontDefault = NULL;