[mathic] 38/62: Changed intermediate directory for MSVC builds.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Apr 1 11:36:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository mathic.
commit 9f701ce75bc0612c7bf690f3cc8a8a3eb7f8c44c
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date: Thu Oct 11 16:21:25 2012 +0200
Changed intermediate directory for MSVC builds.
---
.gitignore | 1 -
build/vs12/mathic-lib/mathic-lib.vcxproj | 20 ++++++-------
build/vs12/mathic-test/mathic-test.vcxproj | 48 +++++++++++++++++-------------
build/vs12/mathic.sln | 3 --
4 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/.gitignore b/.gitignore
index 23789ca..5fbb790 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ configure
*.sdf
*.opensdf
*.vcxproj.user
-intermediate/
output/
# Configure build targets
diff --git a/build/vs12/mathic-lib/mathic-lib.vcxproj b/build/vs12/mathic-lib/mathic-lib.vcxproj
index 4a4cfa2..b85a66a 100755
--- a/build/vs12/mathic-lib/mathic-lib.vcxproj
+++ b/build/vs12/mathic-lib/mathic-lib.vcxproj
@@ -198,42 +198,42 @@
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
<TargetName>mathic</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -241,28 +241,28 @@
<TargetName>mathic</TargetName>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>mathic</TargetName>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>mathic</TargetName>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>mathic</TargetName>
<TargetExt>.lib</TargetExt>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/build/vs12/mathic-test/mathic-test.vcxproj b/build/vs12/mathic-test/mathic-test.vcxproj
index a023aab..c950cad 100755
--- a/build/vs12/mathic-test/mathic-test.vcxproj
+++ b/build/vs12/mathic-test/mathic-test.vcxproj
@@ -149,52 +149,52 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
+ <IntDir>$(SolutionDir)\output\$(Platform)\$(Configuration)\intermediate\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -210,7 +210,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -227,7 +227,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|Win32'">
@@ -244,7 +244,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WarningAsError|x64'">
@@ -261,7 +261,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|Win32'">
@@ -278,7 +278,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-NoAssert|x64'">
@@ -295,7 +295,7 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -315,7 +315,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -335,7 +335,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|Win32'">
@@ -356,7 +356,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Assert|x64'">
@@ -377,7 +377,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(SolutionDir)\output\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
- <AdditionalDependencies>mathic.lib;memtailor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -388,6 +388,14 @@
<ClCompile Include="..\..\..\src\test\PairQueue.cpp" />
<ClCompile Include="..\..\..\src\test\testMain.cpp" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\memtailor\build\vs12\memtailor-lib\memtailor-lib.vcxproj">
+ <Project>{534c44f8-ba0a-4af0-95f1-260ca8ef3551}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\mathic-lib\mathic-lib.vcxproj">
+ <Project>{bebd36f1-a124-4c01-8e67-3208d4472661}</Project>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/build/vs12/mathic.sln b/build/vs12/mathic.sln
index 2c20cdb..2d54e62 100755
--- a/build/vs12/mathic.sln
+++ b/build/vs12/mathic.sln
@@ -2,9 +2,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathic-lib", "mathic-lib\mathic-lib.vcxproj", "{BEBD36F1-A124-4C01-8E67-3208D4472661}"
- ProjectSection(ProjectDependencies) = postProject
- {534C44F8-BA0A-4AF0-95F1-260CA8EF3551} = {534C44F8-BA0A-4AF0-95F1-260CA8EF3551}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathic-test", "mathic-test\mathic-test.vcxproj", "{9B09A868-B169-43E8-AFF9-D2F12657ABCF}"
ProjectSection(ProjectDependencies) = postProject
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git
More information about the debian-science-commits
mailing list