Skip to content
Snippets Groups Projects
Commit 14165911 authored by Mark Winter's avatar Mark Winter
Browse files

Fixed intermediate and output paths in vc projects to avoid overlap.

Modified .gitignore to ignore intermediate outputs from vc builds.
parent 4234108e
No related branches found
No related tags found
No related merge requests found
......@@ -31,10 +31,17 @@ Thumbs.db
*.ilk
*.log
src/c/[Bb]in
src/c/[Dd]ebug*/
src/c/*/[Dd]ebug*/
*.lib
*.sbr
src/c/obj/
src/c/[Rr]elease*/
src/c/*/[Rr]elease*/
src/c/_ReSharper*/
src/c/[Tt]est[Rr]esult*
# Ignore intermediate outputs
src/c/*/Intermediate/
# Allow commit of debug info in bin directory
#!bin/*.pdb
#ignore binaries in MATLAB source
src/MATLAB/*.mexw32
\ No newline at end of file
......@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(ProjectName)\Intermediate\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
......@@ -84,13 +84,13 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy binaries to bin directory"
CommandLine="copy /Y $(OutDir)\$(ProjectName).exe ..\..\bin&#x0D;&#x0A;copy /Y $(OutDir)\$(ProjectName).pdb ..\..\bin"
CommandLine="copy /Y $(OutDir)\$(ProjectName).exe ..\..\bin&#x0D;&#x0A;copy /Y $(OutDir)\$(ProjectName).pdb ..\..\bin&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(ProjectName)\Intermediate\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
......@@ -156,7 +156,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Copy binaries to bin directory"
CommandLine="copy /Y $(OutDir)\$(ProjectName).exe ..\..\bin&#x0D;&#x0A;copy /Y $(OutDir)\$(ProjectName).pdb ..\..\bin"
CommandLine="copy /Y $(OutDir)\$(ProjectName).exe ..\..\bin&#x0D;&#x0A;copy /Y $(OutDir)\$(ProjectName).pdb ..\..\bin&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......
......@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(ProjectName)\Intermediate\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
>
......@@ -97,8 +97,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(ProjectName)\Intermediate\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment