backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

- Removed "Patch applied" region directives from Game.cs and DrawableGameComponent.cs because they made MSBuild complain about bad Syntax.

Browse Source 
- Fixed bug in ContentCompiler build process that occurred when using relative Paths.
- Changed creation method to use relative paths
This commit is contained in:
SND\eagleeyestudios_cp 2012-12-03 15:42:11 +00:00 committed by Konstantin Koch
parent 8dced08668
commit 695ce34937
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANX.Framework/DrawableGameComponent.cs
View File

@ -9,12 +9,6 @@ using ANX.Framework.NonXNA.Development;
// "ANX.Framework developer group" and released under the Ms-PL license. // "ANX.Framework developer group" and released under the Ms-PL license.
// For details see: http://anxframework.codeplex.com/license // For details see: http://anxframework.codeplex.com/license
#region Patch-Log
12/03/2012 #13365 clcrutch
#endregion
namespace ANX.Framework namespace ANX.Framework
{ {
[PercentageComplete(100)] [PercentageComplete(100)]

5
ANX.Framework/Game.cs
View File

@ -14,11 +14,6 @@ using ANX.Framework.NonXNA.SoundSystem;
// "ANX.Framework developer group" and released under the Ms-PL license. // "ANX.Framework developer group" and released under the Ms-PL license.
// For details see: http://anxframework.codeplex.com/license // For details see: http://anxframework.codeplex.com/license
#region Patch-Log
12/03/2012 #13365 clcrutch
#endregion
namespace ANX.Framework namespace ANX.Framework
{ {

22
Tools/ANXContentCompilerGUI/MainWindow.cs
View File

@ -132,7 +132,7 @@ namespace ANX.ContentCompiler.GUI
{ {
ProjectOutputDir = !String.IsNullOrEmpty(dlg2.textBoxLocation.Text) ProjectOutputDir = !String.IsNullOrEmpty(dlg2.textBoxLocation.Text)
? dlg2.textBoxLocation.Text ? dlg2.textBoxLocation.Text
: Path.Combine(ProjectFolder, DefaultOutputPath); : DefaultOutputPath;
} }
else else
return; return;
@ -193,7 +193,9 @@ namespace ANX.ContentCompiler.GUI
_contentProject = ContentProject.Load(path); _contentProject = ContentProject.Load(path);
ProjectName = _contentProject.Name; ProjectName = _contentProject.Name;
ProjectOutputDir = _contentProject.OutputDirectory; ProjectOutputDir = _contentProject.OutputDirectory;
ProjectFolder = _contentProject.InputDirectory; ProjectFolder = Path.GetDirectoryName(path);
if (String.IsNullOrEmpty(_contentProject.InputDirectory))
_contentProject.InputDirectory = ProjectFolder;
ProjectImportersDir = _contentProject.ReferenceIncludeDirectory; ProjectImportersDir = _contentProject.ReferenceIncludeDirectory;
ProjectPath = path; ProjectPath = path;
if (string.IsNullOrEmpty(_contentProject.Creator)) if (string.IsNullOrEmpty(_contentProject.Creator))
@ -223,7 +225,12 @@ namespace ANX.ContentCompiler.GUI
if (_contentProject == null) return; if (_contentProject == null) return;
if (String.IsNullOrEmpty(ProjectPath)) if (String.IsNullOrEmpty(ProjectPath))
SaveProjectAs(sender, e); SaveProjectAs(sender, e);
foreach (var buildItem in _contentProject.BuildItems)
{
if (File.Exists(buildItem.SourceFilename))
buildItem.SourceFilename = buildItem.SourceFilename.Remove(0, Path.GetDirectoryName(ProjectPath).Count() + 1);
}
_contentProject.InputDirectory = ""; //Clear input dir, because we do not need it anymore
_contentProject.Save(ProjectPath); _contentProject.Save(ProjectPath);
if (RecentProjects.Contains(ProjectPath)) if (RecentProjects.Contains(ProjectPath))
RecentProjects.Remove(ProjectPath); RecentProjects.Remove(ProjectPath);
@ -275,6 +282,10 @@ namespace ANX.ContentCompiler.GUI
var buildItems = _contentProject.BuildItems; var buildItems = _contentProject.BuildItems;
foreach (var bI in buildItems) foreach (var bI in buildItems)
{ {
if (!File.Exists(bI.SourceFilename))
bI.SourceFilename = Path.Combine(Path.GetDirectoryName(ProjectPath), bI.SourceFilename);
if (!File.Exists(bI.OutputFilename))
bI.OutputFilename = Path.Combine(Path.GetDirectoryName(ProjectPath), bI.OutputFilename);
if (String.IsNullOrEmpty(bI.ImporterName)) if (String.IsNullOrEmpty(bI.ImporterName))
{ {
bI.ImporterName = ImporterManager.GuessImporterByFileExtension(bI.SourceFilename); bI.ImporterName = ImporterManager.GuessImporterByFileExtension(bI.SourceFilename);
@ -299,6 +310,11 @@ namespace ANX.ContentCompiler.GUI
ribbonTextBox.AddMessage("[ERROR] " + ex + "\n Stack: " + ex.StackTrace); ribbonTextBox.AddMessage("[ERROR] " + ex + "\n Stack: " + ex.StackTrace);
EnableUI(); EnableUI();
} }
foreach (var buildItem in buildItems)
{
buildItem.SourceFilename = buildItem.SourceFilename.Remove(0, ProjectFolder.Count() + 1);
buildItem.OutputFilename = buildItem.OutputFilename.Remove(0, ProjectFolder.Count() + 1);
}
EnableUI(); EnableUI();
} }