소스 검색

tools: do not suppress stdout/stderr in debug builds

Daniele Bartolini 6 년 전
부모
커밋
676e5919bd
3개의 변경된 파일21개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      makefile
  2. 7 1
      tools/config.vala
  3. 13 4
      tools/level_editor/level_editor.vala

+ 1 - 1
makefile

@@ -146,7 +146,7 @@ windows-release64: build/projects/vs2017 build/win64/bin/luajit.exe build/win64/
 rebuild-glib-resources:
 	$(MAKE) -j$(MAKE_JOBS) -R -C tools rebuild
 
-tools-linux-debug64: linux-development64
+tools-linux-debug64: linux-debug64
 	$(MAKE) -j$(MAKE_JOBS) -R -C build/projects/linux level-editor config=debug
 tools-linux-release64: linux-development64
 	$(MAKE) -j$(MAKE_JOBS) -R -C build/projects/linux level-editor config=release

+ 7 - 1
tools/config.vala

@@ -16,7 +16,13 @@ namespace Crown
 	const string EXE_PREFIX = "";
 	const string EXE_SUFFIX = ".exe";
 #endif
-	const string ENGINE_EXE = EXE_PREFIX + "crown-development" + EXE_SUFFIX;
+	const string ENGINE_EXE = EXE_PREFIX
+#if CROWN_DEBUG
+		+ "crown-debug"
+#else
+		+ "crown-development"
+#endif
+		+ EXE_SUFFIX;
 
 	const uint16 CROWN_DEFAULT_SERVER_PORT = 10618;
 

+ 13 - 4
tools/level_editor/level_editor.vala

@@ -585,7 +585,7 @@ namespace Crown
 				null
 			};
 
-			GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(SubprocessFlags.STDOUT_SILENCE | SubprocessFlags.STDERR_SILENCE);
+			GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(subprocess_flags());
 			sl.set_cwd(ENGINE_DIR);
 			try
 			{
@@ -655,7 +655,7 @@ namespace Crown
 				null
 			};
 
-			GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(SubprocessFlags.STDOUT_SILENCE | SubprocessFlags.STDERR_SILENCE);
+			GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(subprocess_flags());
 			sl.set_cwd(ENGINE_DIR);
 			try
 			{
@@ -717,7 +717,7 @@ namespace Crown
 						null
 					};
 
-					GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(SubprocessFlags.STDOUT_SILENCE | SubprocessFlags.STDERR_SILENCE);
+					GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(subprocess_flags());
 					sl.set_cwd(ENGINE_DIR);
 
 					try
@@ -781,7 +781,7 @@ namespace Crown
 					null
 				};
 
-				GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(SubprocessFlags.STDOUT_SILENCE | SubprocessFlags.STDERR_SILENCE);
+				GLib.SubprocessLauncher sl = new GLib.SubprocessLauncher(subprocess_flags());
 				sl.set_cwd(ENGINE_DIR);
 				try
 				{
@@ -1512,6 +1512,15 @@ namespace Crown
 		}
 	}
 
+	public static GLib.SubprocessFlags subprocess_flags()
+	{
+		GLib.SubprocessFlags flags = SubprocessFlags.NONE;
+#if !CROWN_DEBUG
+		flags |= SubprocessFlags.STDOUT_SILENCE | SubprocessFlags.STDERR_SILENCE;
+#endif
+		return flags;
+	}
+
 	public static int main (string[] args)
 	{
 		Gtk.init(ref args);