ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not write out the build tools output to junk.txt, it hides the output from the cmd window. in ancient time the editor was loading junk.txt into the console afterwards, but that is long gone now - so that feature was entirely detrimental at this point

This commit is contained in:
ttimo 2022-11-14 14:13:33 -06:00
parent 28fe20b384
commit d441e69264
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
radiant/main.cpp
View File

@ -1187,7 +1187,6 @@ static gboolean RunBsp_CaptureOutput(void *data) {
void RunBsp( char *command ){ void RunBsp( char *command ){
GPtrArray *sys; GPtrArray *sys;
char batpath[BIG_PATH_MAX]; char batpath[BIG_PATH_MAX];
char temppath[BIG_PATH_MAX];
char name[BIG_PATH_MAX]; char name[BIG_PATH_MAX];
char cWork[BIG_PATH_MAX]; char cWork[BIG_PATH_MAX];
FILE *hFile; FILE *hFile;
@ -1195,8 +1194,6 @@ void RunBsp( char *command ){
SetInspectorMode( W_CONSOLE ); SetInspectorMode( W_CONSOLE );
strcpy( temppath, g_strTempPath.GetBuffer() );
SaveWithRegion( name ); SaveWithRegion( name );
const char *rsh = ValueForKey( g_qeglobals.d_project_entity, "rshcmd" ); const char *rsh = ValueForKey( g_qeglobals.d_project_entity, "rshcmd" );
@ -1228,24 +1225,13 @@ void RunBsp( char *command ){
for ( i = 0; i < sys->len; i++ ) for ( i = 0; i < sys->len; i++ )
{ {
strSys += (char *)g_ptr_array_index( sys, i ); strSys += (char *)g_ptr_array_index( sys, i );
#ifdef _WIN32 // write temp\junk.txt in win32... NOTE: stops output to shell prompt window
if ( i == 0 ) {
strSys += " >";
}
else{
strSys += " >>";
}
strSys += "\"";
strSys += temppath;
strSys += "junk.txt\"";
#endif
strSys += "\n"; strSys += "\n";
}; };
#if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ ) #if defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __APPLE__ )
// write qe3bsp.sh // write qe3bsp.sh
sprintf( batpath, "%sqe3bsp.sh", temppath ); sprintf( batpath, "%sqe3bsp.sh", g_strTempPath.GetBuffer() );
Sys_Printf( "Writing the compile script to '%s'\n", batpath ); Sys_Printf( "Writing the compile script to '%s'\n", batpath );
hFile = fopen( batpath, "w" ); hFile = fopen( batpath, "w" );
if ( !hFile ) { if ( !hFile ) {
@ -1258,9 +1244,8 @@ void RunBsp( char *command ){
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
sprintf( batpath, "%sqe3bsp.bat", temppath ); sprintf( batpath, "%sqe3bsp.bat", g_strTempPath.GetBuffer() );
Sys_Printf( "Writing the compile script to '%s'\n", batpath ); Sys_Printf( "Writing the compile script to '%s'\n", batpath );
Sys_Printf( "The build output will be saved in '%sjunk.txt'\n", temppath );
hFile = fopen( batpath, "w" ); hFile = fopen( batpath, "w" );
if ( !hFile ) { if ( !hFile ) {
Error( "Can't write to %s", batpath ); Error( "Can't write to %s", batpath );
@ -1312,7 +1297,7 @@ void RunBsp( char *command ){
} }
// free the strings and the array // free the strings and the array
for ( i = 0; i < sys->len; i++ ) { for ( i = 0; i < sys->len; i++ ) {
delete[] (char *)g_ptr_array_index( sys, i ); delete[](char*)g_ptr_array_index( sys, i );
} }
g_ptr_array_free( sys, TRUE ); g_ptr_array_free( sys, TRUE );
sys = NULL; sys = NULL;