diff options
Diffstat (limited to 'Prebuild')
-rw-r--r-- | Prebuild/Prebuild.sln | 26 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 11 |
2 files changed, 19 insertions, 18 deletions
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index fbbbd7e..b36ed1e 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln | |||
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00 | |||
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{6A56621D-A328-4E23-96E3-0514A3817BAF}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{6A56621D-A328-4E23-96E3-0514A3817BAF}" |
4 | EndProject | 4 | EndProject |
5 | Global | 5 | Global |
6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
7 | Debug|Any CPU = Debug|Any CPU | 7 | Debug|Any CPU = Debug|Any CPU |
8 | Release|Any CPU = Release|Any CPU | 8 | Release|Any CPU = Release|Any CPU |
9 | EndGlobalSection | 9 | EndGlobalSection |
10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
11 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 11 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
12 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU | 12 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU |
13 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU | 13 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU |
14 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.Build.0 = Release|Any CPU | 14 | {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.Build.0 = Release|Any CPU |
15 | EndGlobalSection | 15 | EndGlobalSection |
16 | GlobalSection(SolutionProperties) = preSolution | 16 | GlobalSection(SolutionProperties) = preSolution |
17 | HideSolutionNode = FALSE | 17 | HideSolutionNode = FALSE |
18 | EndGlobalSection | 18 | EndGlobalSection |
19 | EndGlobal | 19 | EndGlobal |
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index bd366dc..242bb9c 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs | |||
@@ -83,10 +83,10 @@ namespace Prebuild.Core.Targets | |||
83 | if(solution.ProjectsTable.ContainsKey(refr.Name)) | 83 | if(solution.ProjectsTable.ContainsKey(refr.Name)) |
84 | { | 84 | { |
85 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; | 85 | ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; |
86 | string fileRef = FindFileReference(refr.Name, project); | 86 | |
87 | string finalPath = Helper.NormalizePath(Helper.MakeFilePath(project.FullPath + "/${build.dir}/", refr.Name, "dll"), '/'); | 87 | string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); |
88 | ret += finalPath; | 88 | |
89 | return ret; | 89 | return finalPath; |
90 | } | 90 | } |
91 | else | 91 | else |
92 | { | 92 | { |
@@ -316,7 +316,8 @@ namespace Prebuild.Core.Targets | |||
316 | ss.WriteLine(" </lib>"); | 316 | ss.WriteLine(" </lib>"); |
317 | foreach(ReferenceNode refr in project.References) | 317 | foreach(ReferenceNode refr in project.References) |
318 | { | 318 | { |
319 | ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/')); | 319 | string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/'); |
320 | ss.WriteLine(" <include name=\""+ path + "\" />" ); | ||
320 | } | 321 | } |
321 | ss.WriteLine(" </references>"); | 322 | ss.WriteLine(" </references>"); |
322 | 323 | ||