TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'php5.3_fixes' of https://github.com/losinggeneration/Torque3D into losinggeneration-php5.3_fixes

Browse source
This commit is contained in:
DavidWyand-GG 2012-09-27 14:11:41 -04:00
parent a14578d4fb 22fbe0e6e2
commit 2a4bde77b4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tools/projectGenerator/classes/FileUtil.php
View file

@ -81,7 +81,7 @@ class FileUtil
if( !is_array( $v ) )
continue;
FileUtil::trimFileList( &$list[ $k ] );
FileUtil::trimFileList( $list[ $k ] );
}
}

5
Tools/projectGenerator/classes/Project.php
View file

@ -303,7 +303,7 @@ class Project
}
}
FileUtil::trimFileList( &$projectFiles );
FileUtil::trimFileList( $projectFiles );
// Uncomment me to see the structure the file lister is returning.
//print_r($projectFiles);
@ -316,6 +316,7 @@ class Project
// Set the template delimiters
$tpl->left_delimiter = $output->ldelim ? $output->ldelim : '{';
$tpl->right_delimiter = $output->rdelim ? $output->rdelim : '}';
$gameProjectName = getGameProjectName();
// Evaluate template into a file.
$tpl->assign_by_ref( 'projSettings', $this );
@ -331,7 +332,7 @@ class Project
$tpl->assign_by_ref( 'projLibs', $this->libs );
$tpl->assign_by_ref( 'projLibDirs', $this->lib_dirs );
$tpl->assign_by_ref( 'projDepend', $this->dependencies );
$tpl->assign_by_ref( 'gameProjectName', getGameProjectName() );
$tpl->assign_by_ref( 'gameProjectName', $gameProjectName );
$tpl->assign_by_ref( 'projModuleDefinitionFile', $this->moduleDefinitionFile );
$tpl->assign_by_ref( 'projSubSystem', $this->projSubSystem );