projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xbuild] Fix ProcessWrapper to WaitForExit(..) before accessing ExitCode
[mono.git]
/
msvc
/
test-invoke.vcxproj
diff --git
a/msvc/test-invoke.vcxproj
b/msvc/test-invoke.vcxproj
index ecfc8d6953c2c425241da579a84e2ce28e4d254a..2088fa3f0acf3f4f0573e740b00ff492b00a37d3 100644
(file)
--- a/
msvc/test-invoke.vcxproj
+++ b/
msvc/test-invoke.vcxproj
@@
-62,23
+62,23
@@
<PropertyGroup Label="UserMacros" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<PropertyGroup Label="UserMacros" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
\r
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
\r
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
- <AdditionalIncludeDirectories>
..\..\..\libgc\include;..\..\VSDependancies\include\glib-2.0;..\..\VSDependancies\include\glib-2.0\glib;..\..\VSDependancies\lib\glib-2.0\include;..\..\VSDependancies\include;..\..\;C:\cygwin\opt\mono\
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>
$(SolutionDir)
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
@@
-97,7
+97,7
@@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ProjectReference>
\r
<Link>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ProjectReference>
\r
<Link>
\r
- <AdditionalDependencies>
glib-2.0.lib;gmodule-2.0.lib;ws2_32.lib;gthread-2.0.lib;gobject-2.0.lib;libmono
.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
+ <AdditionalDependencies>
ws2_32
.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
<AdditionalLibraryDirectories>$(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<SubSystem>Console</SubSystem>
\r
<AdditionalLibraryDirectories>$(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<SubSystem>Console</SubSystem>
\r
@@
-117,6
+117,7
@@
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
+ <AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
@@
-139,7
+140,7
@@
</Midl>
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
</Midl>
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
- <AdditionalIncludeDirectories>
..\..\..\libgc\include;..\..\VSDependancies\include\glib-2.0;..\..\VSDependancies\include\glib-2.0\glib;..\..\VSDependancies\lib\glib-2.0\include;..\..\VSDependancies\include;..\..\;C:\cygwin\opt\mono\
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>
$(SolutionDir)
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
@@
-178,6
+179,7
@@
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
+ <AdditionalIncludeDirectories>$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
@@
-198,6
+200,10
@@
<ProjectReference Include="libmono.vcxproj">
\r
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
<ProjectReference Include="libmono.vcxproj">
\r
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
+ <Private>false</Private>
\r
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
\r
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
\r
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
\r
</ProjectReference>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
</ProjectReference>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r