diff options
author | lateralusX <lateralusx.github@gmail.com> | 2017-09-22 10:44:04 +0300 |
---|---|---|
committer | lateralusX <lateralusx.github@gmail.com> | 2017-10-03 10:20:10 +0300 |
commit | 52e98abd6e5c6d10ddea91a529f7b1b2336e0696 (patch) | |
tree | efd847c2e390a0fb69beb0fd554fca602e0ec3b9 | |
parent | 92576e31d2dadb37308abf8b048ccd0a97c98584 (diff) |
Restructure of mono.sln and build properties to better fix static/dynamic library support.
53 files changed, 3194 insertions, 3115 deletions
diff --git a/mcs/jay/jay.vcxproj b/mcs/jay/jay.vcxproj index 3d6f8c0d4f0..653bb388f7e 100644 --- a/mcs/jay/jay.vcxproj +++ b/mcs/jay/jay.vcxproj @@ -44,27 +44,25 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SKEL_DIRECTORY=".";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>copy $(OutDir)jay.exe $(ProjectDir)jay.exe</Command>
</PostBuildEvent>
+ <ProjectReference>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -72,18 +70,18 @@ <PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>copy $(OutDir)jay.exe $(ProjectDir)jay.exe</Command>
</PostBuildEvent>
+ <ProjectReference>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="closure.c" />
diff --git a/mono/mini/mini.h b/mono/mini/mini.h index 42a0356ef83..1ce7a63264a 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -54,9 +54,11 @@ * The mini code should not have any compile time dependencies on the GC being used, so the same object file from mini/ * can be linked into both mono and mono-sgen. */ +#if !defined(MONO_DLL_EXPORT) || !defined(_MSC_VER) #if defined(HAVE_BOEHM_GC) || defined(HAVE_SGEN_GC) #error "The code in mini/ should not depend on these defines." #endif +#endif #ifndef __GNUC__ /*#define __alignof__(a) sizeof(a)*/ diff --git a/msvc/eglib-common.targets b/msvc/eglib-common.targets index fa566976672..3776cd70ec5 100644 --- a/msvc/eglib-common.targets +++ b/msvc/eglib-common.targets @@ -28,4 +28,7 @@ <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h" /> <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h" /> </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\eglib\src\Makefile.am" /> + </ItemGroup> </Project> diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters index dcd4a5942fb..e719977b2cf 100644 --- a/msvc/eglib-common.targets.filters +++ b/msvc/eglib-common.targets.filters @@ -2,78 +2,83 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\ghashtable.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c"> - <Filter>Source Files\Common</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Common</Filter> </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h"> - <Filter>Header Files\Common</Filter> + <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter> </ClInclude> <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h"> - <Filter>Header Files\Common</Filter> + <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter> </ClInclude> <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h"> - <Filter>Header Files\Common</Filter> + <Filter>Header Files$(EGLibFilterSubFolder)\Common</Filter> </ClInclude> </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\eglib\src\Makefile.am"> + <Filter>Resource Files$(EGLibFilterSubFolder)</Filter> + </None> + </ItemGroup> </Project> diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters index 76265435b14..3a39ceec9a1 100644 --- a/msvc/eglib-posix.targets.filters +++ b/msvc/eglib-posix.targets.filters @@ -2,7 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c"> - <Filter>Source Files\Posix</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Posix</Filter> </ClCompile> </ItemGroup> </Project> diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters index a1ed81ba268..3ed610b8530 100644 --- a/msvc/eglib-win32.targets.filters +++ b/msvc/eglib-win32.targets.filters @@ -2,33 +2,33 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c"> - <Filter>Source Files\Win32</Filter> + <Filter>Source Files$(EGLibFilterSubFolder)\Win32</Filter> </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h"> - <Filter>Header Files\Win32</Filter> + <Filter>Header Files$(EGLibFilterSubFolder)\Win32</Filter> </ClInclude> </ItemGroup> </Project> diff --git a/msvc/eglib.targets b/msvc/eglib.targets new file mode 100644 index 00000000000..5f9d4cd1c90 --- /dev/null +++ b/msvc/eglib.targets @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="eglib-common.targets" /> + <Import Project="eglib-win32.targets" /> + <Import Project="eglib-posix.targets" /> +</Project>
\ No newline at end of file diff --git a/msvc/eglib.targets.filters b/msvc/eglib.targets.filters new file mode 100644 index 00000000000..bc155a60439 --- /dev/null +++ b/msvc/eglib.targets.filters @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="eglib-common.targets.filters" /> + <Import Project="eglib-win32.targets.filters" /> + <Import Project="eglib-posix.targets.filters" /> + <ItemGroup Condition="'$(EGLibFilterSubFolder)'!=''"> + <Filter Include="Source Files$(EGLibFilterSubFolder)"> + <UniqueIdentifier>{8B3E0DAF-48EA-4B5F-B573-4E8ED8525134}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files$(EGLibFilterSubFolder)"> + <UniqueIdentifier>{1277B2DB-F7E8-44C0-9F8B-5933EB5BD879}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(EGLibFilterSubFolder)"> + <UniqueIdentifier>{9B2D78CC-201F-48DF-8710-839BCDB0AEE9}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <Filter Include="Header Files$(EGLibFilterSubFolder)\Common"> + <UniqueIdentifier>{04853f35-873a-4b07-990a-61dc8ebd5105}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files$(EGLibFilterSubFolder)\Win32"> + <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(EGLibFilterSubFolder)\Common"> + <UniqueIdentifier>{7a01f670-6a6a-4837-b3ac-cd6c08075b4e}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(EGLibFilterSubFolder)\Win32"> + <UniqueIdentifier>{c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(EGLibFilterSubFolder)\Posix"> + <UniqueIdentifier>{3c958a68-b6a1-40d3-834c-b50be09cb819}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project> diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index e4f706775c3..c4845c36745 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -84,14 +84,12 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,14 +98,14 @@ </Command>
</PreBuildEvent>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -121,14 +119,12 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -140,28 +136,23 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
</ItemDefinitionGroup>
- <Import Project="eglib-common.targets" />
- <Import Project="eglib-win32.targets" />
- <Import Project="eglib-posix.targets" />
+ <Import Project="eglib.targets" />
<ItemGroup>
<ProjectReference Include="build-init.vcxproj">
<Project>{92ae7622-5f58-4234-9a26-9ec71876b3f4}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="..\eglib\src\Makefile.am" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/eglib.vcxproj.filters b/msvc/eglib.vcxproj.filters index 3805150c83a..8836550d6cd 100644 --- a/msvc/eglib.vcxproj.filters +++ b/msvc/eglib.vcxproj.filters @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="eglib-common.targets.filters" />
- <Import Project="eglib-win32.targets.filters" />
- <Import Project="eglib-posix.targets.filters" />
+ <Import Project="eglib.targets.filters" />
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{d16b81e3-5093-424e-a5d4-e7dd8da49dce}</UniqueIdentifier>
@@ -13,25 +11,5 @@ <Filter Include="Resource Files">
<UniqueIdentifier>{38a39ff1-842b-431b-b54b-24094e8283eb}</UniqueIdentifier>
</Filter>
- <Filter Include="Header Files\Common">
- <UniqueIdentifier>{04853f35-873a-4b07-990a-61dc8ebd5105}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Win32">
- <UniqueIdentifier>{80953075-5d05-41b9-be90-82497081b11c}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Common">
- <UniqueIdentifier>{7a01f670-6a6a-4837-b3ac-cd6c08075b4e}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Win32">
- <UniqueIdentifier>{c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Posix">
- <UniqueIdentifier>{3c958a68-b6a1-40d3-834c-b50be09cb819}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\eglib\src\Makefile.am">
- <Filter>Resource Files</Filter>
- </None>
</ItemGroup>
</Project>
diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index b6a4a81c135..e89ff36571d 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -108,13 +108,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -127,9 +123,7 @@ <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent />
<CustomBuildStep>
@@ -155,13 +149,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -172,11 +162,8 @@ </ProjectReference>
<Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent />
<CustomBuildStep>
@@ -203,16 +190,13 @@ </HeaderFileName>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -223,11 +207,8 @@ </ProjectReference>
<Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent />
<CustomBuildStep>
@@ -249,17 +230,13 @@ </HeaderFileName>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>CompileAsC</CompileAs>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -270,11 +247,8 @@ </ProjectReference>
<Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent />
<CustomBuildStep>
diff --git a/msvc/libgc.targets b/msvc/libgc.targets new file mode 100644 index 00000000000..e2d3808bbfa --- /dev/null +++ b/msvc/libgc.targets @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\libgc\allchblk.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\alloc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\blacklst.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\dbg_mlc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\dyn_load.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\finalize.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\gcj_mlc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\headers.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mach_dep.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\malloc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mallocx.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mark.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mark_rts.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\misc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\new_hblk.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\obj_map.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\os_dep.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\ptr_chck.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\reclaim.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\stubborn.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\typd_mlc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\win32_threads.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_hdrs.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_locks.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_mark.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_pmark.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_priv.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gcconfig.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='boehm'">true</ExcludedFromBuild> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/libgc.targets.filters b/msvc/libgc.targets.filters new file mode 100644 index 00000000000..a4e98eb83f7 --- /dev/null +++ b/msvc/libgc.targets.filters @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\libgc\allchblk.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\alloc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\blacklst.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\dbg_mlc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\dyn_load.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\finalize.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\gcj_mlc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\headers.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mach_dep.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\malloc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mallocx.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mark.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\mark_rts.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\misc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\new_hblk.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\obj_map.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\os_dep.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\ptr_chck.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\reclaim.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\stubborn.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\typd_mlc.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\libgc\win32_threads.c"> + <Filter>Source Files$(GCboehmFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_hdrs.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_locks.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\gc_mark.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_pmark.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gc_priv.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\libgc\include\private\gcconfig.h"> + <Filter>Header Files$(GCboehmFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup Condition="'$(GCboehmFilterSubFolder)'!=''"> + <Filter Include="Header Files$(GCboehmFilterSubFolder)"> + <UniqueIdentifier>{9671D54B-CA64-4CFA-89BD-D90D90D38F6B}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(GCboehmFilterSubFolder)"> + <UniqueIdentifier>{AA2FEF48-1466-481B-AA60-BF0DA57967BC}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(GCboehmFilterSubFolder)"> + <UniqueIdentifier>{67EC6108-4A9F-4B19-B019-734A71CDFE30}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 60a246b16b5..5f9fe4a265c 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -82,27 +82,24 @@ <AdditionalIncludeDirectories>$(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <WarningLevel>Level1</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
@@ -115,13 +112,11 @@ <AdditionalIncludeDirectories>$(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
@@ -130,50 +125,18 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Lib />
</ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\libgc\allchblk.c" />
- <ClCompile Include="..\libgc\alloc.c" />
- <ClCompile Include="..\libgc\blacklst.c" />
- <ClCompile Include="..\libgc\dbg_mlc.c" />
- <ClCompile Include="..\libgc\dyn_load.c" />
- <ClCompile Include="..\libgc\finalize.c" />
- <ClCompile Include="..\libgc\gcj_mlc.c" />
- <ClCompile Include="..\libgc\headers.c" />
- <ClCompile Include="..\libgc\mach_dep.c" />
- <ClCompile Include="..\libgc\malloc.c" />
- <ClCompile Include="..\libgc\mallocx.c" />
- <ClCompile Include="..\libgc\mark.c" />
- <ClCompile Include="..\libgc\mark_rts.c" />
- <ClCompile Include="..\libgc\misc.c" />
- <ClCompile Include="..\libgc\new_hblk.c" />
- <ClCompile Include="..\libgc\obj_map.c" />
- <ClCompile Include="..\libgc\os_dep.c" />
- <ClCompile Include="..\libgc\ptr_chck.c" />
- <ClCompile Include="..\libgc\reclaim.c" />
- <ClCompile Include="..\libgc\stubborn.c" />
- <ClCompile Include="..\libgc\typd_mlc.c" />
- <ClCompile Include="..\libgc\win32_threads.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libgc\include\gc.h" />
- <ClInclude Include="..\libgc\include\private\gc_hdrs.h" />
- <ClInclude Include="..\libgc\include\private\gc_locks.h" />
- <ClInclude Include="..\libgc\include\gc_mark.h" />
- <ClInclude Include="..\libgc\include\private\gc_pmark.h" />
- <ClInclude Include="..\libgc\include\private\gc_priv.h" />
- <ClInclude Include="..\libgc\include\private\gcconfig.h" />
- </ItemGroup>
+ <Import Project="libgc.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/msvc/libgc.vcxproj.filters b/msvc/libgc.vcxproj.filters index 6453cc0645f..6b0061f7ff6 100644 --- a/msvc/libgc.vcxproj.filters +++ b/msvc/libgc.vcxproj.filters @@ -1,96 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\libgc\allchblk.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\alloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\blacklst.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\dbg_mlc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\dyn_load.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\finalize.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\gcj_mlc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\headers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\mach_dep.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\malloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\mallocx.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\mark.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\mark_rts.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\misc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\new_hblk.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\obj_map.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\os_dep.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\ptr_chck.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\reclaim.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\stubborn.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\typd_mlc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\libgc\win32_threads.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\libgc\include\gc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\private\gc_hdrs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\private\gc_locks.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\gc_mark.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\private\gc_pmark.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\private\gc_priv.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\libgc\include\private\gcconfig.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
+ <Import Project="libgc.targets.filters" />
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{699a2844-7533-4292-9d33-c8f0ff83fc43}</UniqueIdentifier>
diff --git a/msvc/libgcmonosgen.targets b/msvc/libgcmonosgen.targets new file mode 100644 index 00000000000..aba5c4343bf --- /dev/null +++ b/msvc/libgcmonosgen.targets @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-scan-object-concurrent.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-copy-object.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h"> + <ExcludedFromBuild Condition="'$(MONO_TARGET_GC)'!='sgen'">true</ExcludedFromBuild> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/libgcmonosgen.targets.filters b/msvc/libgcmonosgen.targets.filters new file mode 100644 index 00000000000..6713a534ff2 --- /dev/null +++ b/msvc/libgcmonosgen.targets.filters @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-alloc.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-debug.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-fin-weak-hash.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gchandles.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-internal.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-los.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-nursery-allocator.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning-stats.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-simple-nursery.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-split-nursery.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.c"> + <Filter>Source Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\gc-internal-agnostic.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-archdep.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-cardtable.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-client.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-conf.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-copy-object.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-descriptor.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gc.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-gray.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-hash-table.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-layout-stats.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-major-copy-object.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-drain-gray-stack.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-marksweep-scan-object-concurrent.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-memory-governor.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-copy-object.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-minor-scan-object.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pinning.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-pointer-queue.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-protocol-def.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-qsort.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-scan-object.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-tagged-pointer.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-thread-pool.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-workers.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\sgen\sgen-array-list.h"> + <Filter>Header Files$(MonoGCsgenFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup Condition="'$(MonoGCsgenFilterSubFolder)'!=''"> + <Filter Include="Header Files$(MonoGCsgenFilterSubFolder)"> + <UniqueIdentifier>{09852EE2-29A8-4C5A-9DE0-748F4113132B}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(MonoGCsgenFilterSubFolder)"> + <UniqueIdentifier>{D551BA3A-A20D-4FB2-BFF4-0174A3CB19E1}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoGCsgenFilterSubFolder)"> + <UniqueIdentifier>{37293C0E-9158-42C3-BE90-8FE4B63CDFF5}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/libgcmonosgen.vcxproj b/msvc/libgcmonosgen.vcxproj index e0979dbbee0..f27c6652da1 100644 --- a/msvc/libgcmonosgen.vcxproj +++ b/msvc/libgcmonosgen.vcxproj @@ -18,62 +18,6 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\mono\sgen\sgen-alloc.c" />
- <ClCompile Include="..\mono\sgen\sgen-array-list.c" />
- <ClCompile Include="..\mono\sgen\sgen-cardtable.c" />
- <ClCompile Include="..\mono\sgen\sgen-debug.c" />
- <ClCompile Include="..\mono\sgen\sgen-descriptor.c" />
- <ClCompile Include="..\mono\sgen\sgen-gc.c" />
- <ClCompile Include="..\mono\sgen\sgen-gchandles.c" />
- <ClCompile Include="..\mono\sgen\sgen-gray.c" />
- <ClCompile Include="..\mono\sgen\sgen-hash-table.c" />
- <ClCompile Include="..\mono\sgen\sgen-internal.c" />
- <ClCompile Include="..\mono\sgen\sgen-los.c" />
- <ClCompile Include="..\mono\sgen\sgen-marksweep.c" />
- <ClCompile Include="..\mono\sgen\sgen-memory-governor.c" />
- <ClCompile Include="..\mono\sgen\sgen-nursery-allocator.c" />
- <ClCompile Include="..\mono\sgen\sgen-pinning-stats.c" />
- <ClCompile Include="..\mono\sgen\sgen-pinning.c" />
- <ClCompile Include="..\mono\sgen\sgen-pointer-queue.c" />
- <ClCompile Include="..\mono\sgen\sgen-protocol.c" />
- <ClCompile Include="..\mono\sgen\sgen-qsort.c" />
- <ClCompile Include="..\mono\sgen\sgen-simple-nursery.c" />
- <ClCompile Include="..\mono\sgen\sgen-split-nursery.c" />
- <ClCompile Include="..\mono\sgen\sgen-thread-pool.c" />
- <ClCompile Include="..\mono\sgen\sgen-workers.c" />
- <ClCompile Include="..\mono\sgen\sgen-fin-weak-hash.c" />
- <ClCompile Include="..\mono\sgen\sgen-layout-stats.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h" />
- <ClInclude Include="..\mono\sgen\sgen-archdep.h" />
- <ClInclude Include="..\mono\sgen\sgen-array-list.h" />
- <ClInclude Include="..\mono\sgen\sgen-cardtable.h" />
- <ClInclude Include="..\mono\sgen\sgen-client.h" />
- <ClInclude Include="..\mono\sgen\sgen-conf.h" />
- <ClInclude Include="..\mono\sgen\sgen-copy-object.h" />
- <ClInclude Include="..\mono\sgen\sgen-descriptor.h" />
- <ClInclude Include="..\mono\sgen\sgen-gc.h" />
- <ClInclude Include="..\mono\sgen\sgen-gray.h" />
- <ClInclude Include="..\mono\sgen\sgen-hash-table.h" />
- <ClInclude Include="..\mono\sgen\sgen-layout-stats.h" />
- <ClInclude Include="..\mono\sgen\sgen-major-copy-object.h" />
- <ClInclude Include="..\mono\sgen\sgen-marksweep-drain-gray-stack.h" />
- <ClInclude Include="..\mono\sgen\sgen-marksweep-scan-object-concurrent.h" />
- <ClInclude Include="..\mono\sgen\sgen-memory-governor.h" />
- <ClInclude Include="..\mono\sgen\sgen-minor-copy-object.h" />
- <ClInclude Include="..\mono\sgen\sgen-minor-scan-object.h" />
- <ClInclude Include="..\mono\sgen\sgen-pinning.h" />
- <ClInclude Include="..\mono\sgen\sgen-pointer-queue.h" />
- <ClInclude Include="..\mono\sgen\sgen-protocol-def.h" />
- <ClInclude Include="..\mono\sgen\sgen-protocol.h" />
- <ClInclude Include="..\mono\sgen\sgen-qsort.h" />
- <ClInclude Include="..\mono\sgen\sgen-scan-object.h" />
- <ClInclude Include="..\mono\sgen\sgen-tagged-pointer.h" />
- <ClInclude Include="..\mono\sgen\sgen-thread-pool.h" />
- <ClInclude Include="..\mono\sgen\sgen-workers.h" />
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C36612BD-22D3-4B95-85E2-7FDC4FC5D740}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@@ -152,10 +96,10 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -168,11 +112,10 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <OmitFramePointers>false</OmitFramePointers>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;_DEBUG;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -184,12 +127,11 @@ <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -203,12 +145,11 @@ <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;NDEBUG;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -217,6 +158,7 @@ <OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
+ <Import Project="libgcmonosgen.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/msvc/libgcmonosgen.vcxproj.filters b/msvc/libgcmonosgen.vcxproj.filters index b1c22545a6c..f4982279c42 100644 --- a/msvc/libgcmonosgen.vcxproj.filters +++ b/msvc/libgcmonosgen.vcxproj.filters @@ -1,165 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\mono\sgen\sgen-alloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-cardtable.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-debug.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-descriptor.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-fin-weak-hash.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-gchandles.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-gray.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-hash-table.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-internal.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-layout-stats.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-los.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-marksweep.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-memory-governor.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-nursery-allocator.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-pinning.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-pinning-stats.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-pointer-queue.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-protocol.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-qsort.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-simple-nursery.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-split-nursery.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-thread-pool.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-workers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-array-list.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-archdep.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-cardtable.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-client.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-conf.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-copy-object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-descriptor.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-gc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-gray.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-hash-table.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-layout-stats.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-major-copy-object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-marksweep-drain-gray-stack.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-marksweep-scan-object-concurrent.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-memory-governor.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-minor-copy-object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-minor-scan-object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-pinning.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-pointer-queue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-protocol.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-protocol-def.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-qsort.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-scan-object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-tagged-pointer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-thread-pool.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-workers.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-array-list.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
+ <Import Project="libgcmonosgen.targets.filters" />
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{62eb1a19-26dd-4c17-8bd0-0a734673637d}</UniqueIdentifier>
diff --git a/msvc/libmini.targets b/msvc/libmini.targets new file mode 100644 index 00000000000..50ebafb980b --- /dev/null +++ b/msvc/libmini.targets @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\alias-analysis.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\arch-stubs.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-amd64.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-x86.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-runtime.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86-gsharedvt.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\memory-access.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\ir-emit.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\method-to-ir.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\decompose.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-windows.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-x86.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\seq-points.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\version.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\optflags-def.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\cfgdump.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\cfgdump.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\jit-icalls.h " /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\jit-icalls.c " /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\seq-points.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\trace.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\trace.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\patch-info.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-ops.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arch.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\dominators.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\cfold.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\regalloc.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\helpers.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\liveness.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\ssa.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\abcremoval.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\abcremoval.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\local-propagation.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\driver.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\debug-mini.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\linear-scan.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\aot-compiler.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\aot-runtime.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\graph.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-codegen.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-cross-helpers.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-exceptions.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-trampolines.c " /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64-gsharedvt.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86-gsharedvt.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\branch-opts.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-generic-sharing.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\simd-methods.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tasklets.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\tasklets.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\simd-intrinsics.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-unwind.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\unwind.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\image-writer.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\image-writer.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\dwarfwriter.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\dwarfwriter.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-gc.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-gc.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\debugger-agent.h " /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\debugger-agent.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\xdebug.c" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-llvm.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-llvm-cpp.h" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-native-types.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\type-checking.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\lldb.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp-stubs.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-profiler.c" /> + </ItemGroup> + <ItemGroup> + <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-x86.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </CustomBuildStep> + <CustomBuildStep Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </CustomBuildStep> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\mini\Makefile.am.in" /> + </ItemGroup> +</Project> diff --git a/msvc/libmini.targets.filters b/msvc/libmini.targets.filters new file mode 100644 index 00000000000..87f8e5e3df7 --- /dev/null +++ b/msvc/libmini.targets.filters @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\abcremoval.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\alias-analysis.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\aot-compiler.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\aot-runtime.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\arch-stubs.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\branch-opts.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\cfold.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\debugger-agent.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\debug-mini.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\decompose.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\dominators.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\driver.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\dwarfwriter.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-amd64.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\exceptions-x86.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\graph.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\helpers.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\image-writer.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\jit-icalls.c "> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\linear-scan.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\liveness.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\local-propagation.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\method-to-ir.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\memory-access.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-codegen.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-exceptions.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-gc.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-generic-sharing.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-native-types.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-runtime.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-trampolines.c "> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-windows.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\seq-points.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\simd-intrinsics.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\ssa.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tasklets.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\trace.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\unwind.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\xdebug.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\cfgdump.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-cross-helpers.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-x86-gsharedvt.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-amd64-gsharedvt.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\tramp-x86-gsharedvt.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\type-checking.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\lldb.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\interp\interp-stubs.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-profiler.c"> + <Filter>Source Files$(MonoMiniFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\abcremoval.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\debugger-agent.h "> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\dwarfwriter.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\ir-emit.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\image-writer.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\seq-points.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\jit-icalls.h "> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-arch.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-gc.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-llvm.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-llvm-cpp.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-ops.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-unwind.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-x86.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\optflags-def.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\patch-info.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\regalloc.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\simd-methods.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\tasklets.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\trace.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\version.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\cfgdump.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-amd64-gsharedvt.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\mini\mini-windows.h"> + <Filter>Header Files$(MonoMiniFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\mini\Makefile.am.in"> + <Filter>Resource Files$(MonoMiniFilterSubFolder)</Filter> + </None> + </ItemGroup> + <ItemGroup Condition="'$(MonoMiniFilterSubFolder)'!=''"> + <Filter Include="Header Files$(MonoMiniFilterSubFolder)"> + <UniqueIdentifier>{b64924de-7e02-416b-9779-4cc7fe0270e6}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(MonoMiniFilterSubFolder)"> + <UniqueIdentifier>{95531242-a8da-43ec-9ddb-6da7551d9c2d}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoMiniFilterSubFolder)"> + <UniqueIdentifier>{f66c7e0f-6887-449d-81a5-49168ddfc4db}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project> diff --git a/msvc/libmini.vcxproj b/msvc/libmini.vcxproj new file mode 100644 index 00000000000..a0cd5a22319 --- /dev/null +++ b/msvc/libmini.vcxproj @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="eglib.vcxproj">
+ <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{88D2EB79-592D-45F8-B849-AE021C1D983A}</ProjectGuid>
+ <RootNamespace>libmini</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="mono.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="mono.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="mono.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="mono.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ <PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ <PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <StringPooling>true</StringPooling>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <StringPooling>true</StringPooling>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <Import Project="libmini.targets" />
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/msvc/libmini.vcxproj.filters b/msvc/libmini.vcxproj.filters new file mode 100644 index 00000000000..c66a747d501 --- /dev/null +++ b/msvc/libmini.vcxproj.filters @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="libmini.targets.filters" />
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{30FB3E7A-9BC7-47A9-BABB-D34F7CD6F466}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{A4810F67-8B76-40A9-9A43-6048BC8A65F1}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{3E49E932-95E1-4900-89D8-0ABFD8094726}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/msvc/libmono.vcxproj b/msvc/libmono-dynamic.vcxproj index 50fe92351f6..186bd7ffc31 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono-dynamic.vcxproj @@ -19,8 +19,8 @@ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}</ProjectGuid>
- <RootNamespace>libmono</RootNamespace>
+ <ProjectGuid>{675F4175-FFB1-480D-AD36-F397578844D4}</ProjectGuid>
+ <RootNamespace>libmono-dynamic</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -97,38 +97,29 @@ <ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>true</BrowseInformation>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
</Link>
<PostBuildEvent>
<Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
@@ -145,35 +136,27 @@ <ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <BrowseInformation>true</BrowseInformation>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
@@ -186,39 +169,34 @@ </PreBuildEvent>
<ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <CompileAs>CompileAsC</CompileAs>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- </ProjectReference>
+ <ProjectReference />
<Link>
- <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
</PostBuildEvent>
+ <ProjectReference>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
@@ -230,77 +208,49 @@ </Midl>
<ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
- <PrecompiledHeaderOutputFile>
- </PrecompiledHeaderOutputFile>
- <CompileAs>CompileAsC</CompileAs>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
- <ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
- </ProjectReference>
+ <ProjectReference />
<Link>
- <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies Condition="'$(MONO_TARGET_GC)'=='boehm'">$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
+ <ModuleDefinitionFile>
+ </ModuleDefinitionFile>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
<Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
</PostBuildEvent>
+ <ProjectReference>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuildStep Include="..\mono\mini\mini-x86.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\mono\mini\mini-amd64.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuildStep>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
<ProjectReference Include="genmdesc.vcxproj">
<Project>{b7098dfa-31e6-4006-8a15-1c9a4e925149}</Project>
</ProjectReference>
<ProjectReference Include="libgc.vcxproj">
<Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
</ProjectReference>
- <ProjectReference Include="libgcmonosgen.vcxproj">
- <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono-static.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0772}</Project>
- </ProjectReference>
- <ProjectReference Include="libmonoruntime.vcxproj">
- <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d739}</Project>
- </ProjectReference>
- <ProjectReference Include="libmonoutils.vcxproj">
- <Project>{8fc2b0c8-51ad-49df-851f-5d01a77a75e4}</Project>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\mono\mini\mini-windows-dllmain.c" />
</ItemGroup>
<ItemGroup>
- <None Include="mono.def" />
+ <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-windows-dllmain.c" />
</ItemGroup>
+ <Import Project="eglib.targets" />
+ <Import Project="libmonoutils.targets" />
+ <Import Project="libmonoruntime.targets" />
+ <Import Project="libmini.targets" />
+ <Import Project="libgcmonosgen.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/msvc/libmono-dynamic.vcxproj.filters b/msvc/libmono-dynamic.vcxproj.filters new file mode 100644 index 00000000000..dcdb261e742 --- /dev/null +++ b/msvc/libmono-dynamic.vcxproj.filters @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <MonoUtilsFilterSubFolder>\libmonoutils</MonoUtilsFilterSubFolder>
+ <MonoRuntimeFilterSubFolder>\libmonoruntime</MonoRuntimeFilterSubFolder>
+ <MonoMiniFilterSubFolder>\libmini</MonoMiniFilterSubFolder>
+ <MonoGCsgenFilterSubFolder>\libgcmonosgen</MonoGCsgenFilterSubFolder>
+ <EGLibFilterSubFolder>\eglib</EGLibFilterSubFolder>
+ </PropertyGroup>
+ <Import Project="eglib.targets.filters" />
+ <Import Project="libmonoutils.targets.filters" />
+ <Import Project="libmonoruntime.targets.filters" />
+ <Import Project="libmini.targets.filters" />
+ <Import Project="libgcmonosgen.targets.filters" />
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{09693EC3-6099-43FF-A22D-D0651643B146}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{851A7AF5-8521-4F03-9527-D162FB53D9E7}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{58EC90AB-A91B-433C-AE1E-6B09A6D43A3E}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="$(MonoSourceLocation)\mono\mini\mini-windows-dllmain.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/msvc/libmono-static.vcxproj b/msvc/libmono-static.vcxproj index 3554a60c039..0c606ddb6af 100644 --- a/msvc/libmono-static.vcxproj +++ b/msvc/libmono-static.vcxproj @@ -18,128 +18,6 @@ <Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\mono\mini\alias-analysis.c" />
- <ClCompile Include="..\mono\mini\arch-stubs.c" />
- <ClCompile Include="..\mono\mini\exceptions-amd64.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\exceptions-x86.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-amd64.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-amd64-gsharedvt.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-runtime.c" />
- <ClCompile Include="..\mono\mini\mini-windows.c" />
- <ClCompile Include="..\mono\mini\mini-x86.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-x86-gsharedvt.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini.c" />
- <ClCompile Include="..\mono\mini\memory-access.c" />
- <ClInclude Include="..\mono\metadata\remoting.h" />
- <ClInclude Include="..\mono\mini\ir-emit.h" />
- <ClCompile Include="..\mono\mini\method-to-ir.c" />
- <ClCompile Include="..\mono\mini\decompose.c" />
- <ClInclude Include="..\mono\mini\mini-amd64.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-amd64-gsharedvt.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-windows.h" />
- <ClInclude Include="..\mono\mini\mini-x86.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini.h" />
- <ClInclude Include="..\mono\mini\seq-points.h" />
- <ClInclude Include="..\mono\mini\version.h" />
- <ClInclude Include="..\mono\mini\optflags-def.h" />
- <ClInclude Include="..\mono\mini\cfgdump.h" />
- <ClCompile Include="..\mono\mini\cfgdump.c" />
- <ClInclude Include="..\mono\mini\jit-icalls.h " />
- <ClCompile Include="..\mono\mini\jit-icalls.c " />
- <ClCompile Include="..\mono\mini\seq-points.c" />
- <ClCompile Include="..\mono\mini\trace.c" />
- <ClInclude Include="..\mono\mini\trace.h" />
- <ClInclude Include="..\mono\mini\patch-info.h" />
- <ClInclude Include="..\mono\mini\mini-ops.h" />
- <ClInclude Include="..\mono\mini\mini-arch.h" />
- <ClCompile Include="..\mono\mini\dominators.c" />
- <ClCompile Include="..\mono\mini\cfold.c" />
- <ClInclude Include="..\mono\mini\regalloc.h" />
- <ClCompile Include="..\mono\mini\helpers.c" />
- <ClCompile Include="..\mono\mini\liveness.c" />
- <ClCompile Include="..\mono\mini\ssa.c" />
- <ClCompile Include="..\mono\mini\abcremoval.c" />
- <ClInclude Include="..\mono\mini\abcremoval.h" />
- <ClCompile Include="..\mono\mini\local-propagation.c" />
- <ClCompile Include="..\mono\mini\driver.c" />
- <ClCompile Include="..\mono\mini\debug-mini.c" />
- <ClCompile Include="..\mono\mini\linear-scan.c" />
- <ClCompile Include="..\mono\mini\aot-compiler.c" />
- <ClCompile Include="..\mono\mini\aot-runtime.c" />
- <ClCompile Include="..\mono\mini\graph.c" />
- <ClCompile Include="..\mono\mini\mini-codegen.c" />
- <ClCompile Include="..\mono\mini\mini-cross-helpers.c" />
- <ClCompile Include="..\mono\mini\mini-exceptions.c" />
- <ClCompile Include="..\mono\mini\mini-trampolines.c " />
- <ClCompile Include="..\mono\mini\tramp-amd64.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-amd64-gsharedvt.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-x86.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-x86-gsharedvt.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\mini\branch-opts.c" />
- <ClCompile Include="..\mono\mini\mini-generic-sharing.c" />
- <ClInclude Include="..\mono\mini\simd-methods.h" />
- <ClCompile Include="..\mono\mini\tasklets.c" />
- <ClInclude Include="..\mono\mini\tasklets.h" />
- <ClCompile Include="..\mono\mini\simd-intrinsics.c" />
- <ClInclude Include="..\mono\mini\mini-unwind.h" />
- <ClCompile Include="..\mono\mini\unwind.c" />
- <ClInclude Include="..\mono\mini\image-writer.h" />
- <ClCompile Include="..\mono\mini\image-writer.c" />
- <ClInclude Include="..\mono\mini\dwarfwriter.h" />
- <ClCompile Include="..\mono\mini\dwarfwriter.c" />
- <ClInclude Include="..\mono\mini\mini-gc.h" />
- <ClCompile Include="..\mono\mini\mini-gc.c" />
- <ClInclude Include="..\mono\mini\debugger-agent.h " />
- <ClCompile Include="..\mono\mini\debugger-agent.c" />
- <ClCompile Include="..\mono\mini\xdebug.c" />
- <ClInclude Include="..\mono\mini\mini-llvm.h" />
- <ClInclude Include="..\mono\mini\mini-llvm-cpp.h" />
- <ClCompile Include="..\mono\mini\mini-native-types.c" />
- <ClCompile Include="..\mono\mini\type-checking.c" />
- <ClCompile Include="..\mono\mini\lldb.c" />
- <ClCompile Include="..\mono\mini\interp\interp-stubs.c" />
- <ClCompile Include="..\mono\mini\mini-profiler.c" />
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}</ProjectGuid>
<RootNamespace>libmono-static</RootNamespace>
@@ -214,25 +92,24 @@ <ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <BrowseInformation>false</BrowseInformation>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent />
- <Lib>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
+ <Lib />
+ <ProjectReference />
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
@@ -242,25 +119,24 @@ <ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <BrowseInformation>false</BrowseInformation>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent />
- <Lib>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
+ <Lib />
+ <ProjectReference />
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -269,14 +145,14 @@ </PreBuildEvent>
<ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -284,10 +160,11 @@ <OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent />
- <Lib>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
+ <Lib />
+ <ProjectReference />
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
@@ -296,14 +173,14 @@ </PreBuildEvent>
<ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -311,34 +188,25 @@ <OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent />
- <Lib>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
- </Lib>
+ <Lib />
+ <ProjectReference />
+ <ProjectReference>
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ </ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuildStep Include="..\mono\mini\mini-x86.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
- <CustomBuildStep Include="..\mono\mini\mini-amd64.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuildStep>
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
- <ProjectReference Include="genmdesc.vcxproj">
- <Project>{b7098dfa-31e6-4006-8a15-1c9a4e925149}</Project>
- </ProjectReference>
- <ProjectReference Include="libgc.vcxproj">
+ <ProjectReference Condition="'$(MONO_TARGET_GC)'=='boehm'" Include="libgc.vcxproj">
<Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
</ProjectReference>
- <ProjectReference Include="libgcmonosgen.vcxproj">
+ <ProjectReference Condition="'$(MONO_TARGET_GC)'=='sgen'" Include="libgcmonosgen.vcxproj">
<Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
</ProjectReference>
+ <ProjectReference Include="libmini.vcxproj">
+ <Project>{88d2eb79-592d-45f8-b849-ae021c1d983a}</Project>
+ </ProjectReference>
<ProjectReference Include="libmonoruntime.vcxproj">
<Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d739}</Project>
</ProjectReference>
@@ -346,10 +214,7 @@ <Project>{8fc2b0c8-51ad-49df-851f-5d01a77a75e4}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="..\mono\mini\Makefile.am.in" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/libmono-static.vcxproj.filters b/msvc/libmono-static.vcxproj.filters index 672e6052f41..0d407ea4f94 100644 --- a/msvc/libmono-static.vcxproj.filters +++ b/msvc/libmono-static.vcxproj.filters @@ -1,253 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="..\mono\mini\abcremoval.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\alias-analysis.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\aot-compiler.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\aot-runtime.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\arch-stubs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\branch-opts.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\cfold.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\debugger-agent.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\debug-mini.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\decompose.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\dominators.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\driver.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\dwarfwriter.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\exceptions-amd64.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\exceptions-x86.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\graph.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\image-writer.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\jit-icalls.c ">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\linear-scan.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\liveness.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\local-propagation.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\method-to-ir.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\memory-access.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-amd64.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-codegen.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-exceptions.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-generic-sharing.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-native-types.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-runtime.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-trampolines.c ">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-x86.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\seq-points.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\simd-intrinsics.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\ssa.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tasklets.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\trace.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-amd64.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-x86.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\unwind.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\xdebug.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\cfgdump.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-amd64-gsharedvt.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-cross-helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-x86-gsharedvt.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-amd64-gsharedvt.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\tramp-x86-gsharedvt.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\type-checking.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\lldb.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\interp\interp-stubs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\mini\mini-profiler.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\mini\abcremoval.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\debugger-agent.h ">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\dwarfwriter.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\ir-emit.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\image-writer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\seq-points.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\jit-icalls.h ">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-amd64.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-arch.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-gc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-llvm.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-llvm-cpp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-ops.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-unwind.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-x86.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\optflags-def.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\patch-info.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\regalloc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\remoting.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\simd-methods.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\tasklets.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\trace.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\cfgdump.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-amd64-gsharedvt.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\mini\mini-windows.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{bdc9f80b-3045-49d2-bb7b-510450371395}</UniqueIdentifier>
</Filter>
@@ -258,9 +11,4 @@ <UniqueIdentifier>{5370c3c4-b6ec-4f8a-8b21-ce4e782720a6}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <None Include="..\mono\mini\Makefile.am.in">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/libmono.vcxproj.filters b/msvc/libmono.vcxproj.filters deleted file mode 100644 index 91861b6cc1d..00000000000 --- a/msvc/libmono.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{bdc9f80b-3045-49d2-bb7b-510450371395}</UniqueIdentifier>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{f7700495-afaa-4d16-9aac-79d54d10de23}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files">
- <UniqueIdentifier>{5370c3c4-b6ec-4f8a-8b21-ce4e782720a6}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\mono\mini\mini-windows-dllmain.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="mono.def">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/msvc/libmonodac.vcxproj b/msvc/libmonodac.vcxproj index 02308913f62..b016f7b9007 100644 --- a/msvc/libmonodac.vcxproj +++ b/msvc/libmonodac.vcxproj @@ -63,35 +63,28 @@ <ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
- <BrowseInformation>true</BrowseInformation>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>
</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
@@ -109,33 +102,28 @@ </Midl>
<ClCompile>
<AdditionalOptions>/D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
- <CompileAs>CompileAsC</CompileAs>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<ProjectReference>
- <LinkLibraryDependencies>true</LinkLibraryDependencies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>
</ModuleDefinitionFile>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
@@ -144,11 +132,6 @@ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<ClCompile Include="..\mono\mini\mini-windows-dlldac.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/libmonoruntime.targets b/msvc/libmonoruntime.targets new file mode 100644 index 00000000000..13dbf5d16c3 --- /dev/null +++ b/msvc/libmonoruntime.targets @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\appdomain.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\property-bag.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\environment.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\exception.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\filewatcher.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc-stats.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\image.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\jit-info.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mempool.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\number-ms.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\object.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\opcodes.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\rand.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\remoting.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\runtime.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-manager.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker-default.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-old-bridge.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-tarjan-bridge.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\string-icalls.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sysmath.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\verify.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\domain-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\gc-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-ms.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-client-mono.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-def.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug-debugger.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters-def.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-formatter.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\opcodes.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-events.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-manager.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\string-icalls.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sysmath.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tabledefs.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\wrapper-types.h" /> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\metadata\Makefile.am" /> + </ItemGroup> +</Project> diff --git a/msvc/libmonoruntime.targets.filters b/msvc/libmonoruntime.targets.filters new file mode 100644 index 00000000000..8a3f56968a0 --- /dev/null +++ b/msvc/libmonoruntime.targets.filters @@ -0,0 +1,619 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\environment.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\exception.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\filewatcher.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\image.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\jit-info.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mempool.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\number-ms.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\opcodes.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\rand.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\remoting.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\runtime.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-manager.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\string-icalls.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sysmath.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker-default.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\verify.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\boehm</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\appdomain.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc-stats.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\object.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-old-bridge.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-tarjan-bridge.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\metadata\property-bag.c"> + <Filter>Source Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\domain-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-def.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug-debugger.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters-def.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-formatter.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-ms.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\opcodes.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-events.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-manager.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\string-icalls.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sysmath.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tabledefs.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\wrapper-types.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-client-mono.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\sgen</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\gc-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\gc</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\metadata\Makefile.am"> + <Filter>Resource Files$(MonoRuntimeFilterSubFolder)</Filter> + </None> + </ItemGroup> + <ItemGroup Condition="'$(MonoRuntimeFilterSubFolder)'!=''"> + <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)"> + <UniqueIdentifier>{992766FD-0584-4B49-A4F7-B59947CD8488}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(MonoRuntimeFilterSubFolder)"> + <UniqueIdentifier>{12D2E658-65D0-48E9-8F7A-6355482F17DA}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoRuntimeFilterSubFolder)"> + <UniqueIdentifier>{DC656245-EE35-4C36-AA40-A109905666F3}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <Filter Include="Source Files$(MonoRuntimeFilterSubFolder)\boehm"> + <UniqueIdentifier>{728e57f8-14d3-42f4-b92a-be03cd2acdfa}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoRuntimeFilterSubFolder)\sgen"> + <UniqueIdentifier>{d5996ea0-8b43-4267-a46c-715270aaee2b}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\boehm"> + <UniqueIdentifier>{2446a0bf-5f8b-4789-91ab-6107f72b8539}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\sgen"> + <UniqueIdentifier>{5fede250-d478-466b-aa2a-36d2222de065}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoRuntimeFilterSubFolder)\gc"> + <UniqueIdentifier>{410dd556-6715-4c4e-beff-c5dd7a6b78a1}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\gc"> + <UniqueIdentifier>{e37c9a88-bfb3-47dd-948c-a74dea25b3ad}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj index 84c3083b3a1..b9b512dddb3 100644 --- a/msvc/libmonoruntime.vcxproj +++ b/msvc/libmonoruntime.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -19,211 +19,10 @@ </ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\mono\metadata\appdomain.c" />
- <ClCompile Include="..\mono\metadata\assembly.c" />
- <ClCompile Include="..\mono\metadata\attach.c" />
- <ClCompile Include="..\mono\metadata\boehm-gc.c" />
- <ClCompile Include="..\mono\metadata\callspec.c" />
- <ClCompile Include="..\mono\metadata\class-accessors.c" />
- <ClCompile Include="..\mono\metadata\class.c" />
- <ClCompile Include="..\mono\metadata\cominterop.c" />
- <ClCompile Include="..\mono\metadata\console-win32.c" />
- <ClCompile Include="..\mono\metadata\property-bag.c" />
- <ClCompile Include="..\mono\metadata\w32socket-win32.c" />
- <ClCompile Include="..\mono\metadata\w32file-win32.c" />
- <ClCompile Include="..\mono\metadata\w32error-win32.c" />
- <ClCompile Include="..\mono\metadata\icall-windows.c" />
- <ClCompile Include="..\mono\metadata\marshal-windows.c" />
- <ClCompile Include="..\mono\metadata\mono-security-windows.c" />
- <ClCompile Include="..\mono\metadata\w32mutex-win32.c" />
- <ClCompile Include="..\mono\metadata\w32semaphore-win32.c" />
- <ClCompile Include="..\mono\metadata\w32event-win32.c" />
- <ClCompile Include="..\mono\metadata\w32process.c" />
- <ClCompile Include="..\mono\metadata\w32process-win32.c" />
- <ClCompile Include="..\mono\metadata\coree.c" />
- <ClCompile Include="..\mono\metadata\custom-attrs.c" />
- <ClCompile Include="..\mono\metadata\debug-helpers.c" />
- <ClCompile Include="..\mono\metadata\debug-mono-ppdb.c" />
- <ClCompile Include="..\mono\metadata\debug-mono-symfile.c" />
- <ClCompile Include="..\mono\metadata\decimal-ms.c" />
- <ClCompile Include="..\mono\metadata\dynamic-image.c" />
- <ClCompile Include="..\mono\metadata\dynamic-stream.c" />
- <ClCompile Include="..\mono\metadata\domain.c" />
- <ClCompile Include="..\mono\metadata\environment.c" />
- <ClCompile Include="..\mono\metadata\exception.c" />
- <ClCompile Include="..\mono\metadata\w32file.c" />
- <ClCompile Include="..\mono\metadata\file-mmap-windows.c" />
- <ClCompile Include="..\mono\metadata\filewatcher.c" />
- <ClCompile Include="..\mono\metadata\gc-stats.c" />
- <ClCompile Include="..\mono\metadata\gc.c" />
- <ClCompile Include="..\mono\metadata\handle.c" />
- <ClCompile Include="..\mono\metadata\icall.c" />
- <ClCompile Include="..\mono\metadata\image.c" />
- <ClCompile Include="..\mono\metadata\jit-info.c" />
- <ClCompile Include="..\mono\metadata\loader.c" />
- <ClCompile Include="..\mono\metadata\locales.c" />
- <ClCompile Include="..\mono\metadata\lock-tracer.c" />
- <ClCompile Include="..\mono\metadata\marshal.c" />
- <ClCompile Include="..\mono\metadata\mempool.c" />
- <ClCompile Include="..\mono\metadata\metadata-verify.c" />
- <ClCompile Include="..\mono\metadata\metadata.c" />
- <ClCompile Include="..\mono\metadata\metadata-cross-helpers.c" />
- <ClCompile Include="..\mono\metadata\method-builder.c" />
- <ClCompile Include="..\mono\metadata\monitor.c" />
- <ClCompile Include="..\mono\metadata\mono-basic-block.c" />
- <ClCompile Include="..\mono\metadata\mono-config.c" />
- <ClCompile Include="..\mono\metadata\mono-config-dirs.c" />
- <ClCompile Include="..\mono\metadata\mono-debug.c" />
- <ClCompile Include="..\mono\metadata\mono-endian.c" />
- <ClCompile Include="..\mono\metadata\mono-hash.c" />
- <ClCompile Include="..\mono\metadata\mono-conc-hash.c" />
- <ClCompile Include="..\mono\metadata\mono-mlist.c" />
- <ClCompile Include="..\mono\metadata\mono-perfcounters.c" />
- <ClCompile Include="..\mono\metadata\null-gc.c" />
- <ClCompile Include="..\mono\metadata\number-ms.c" />
- <ClCompile Include="..\mono\metadata\object.c" />
- <ClCompile Include="..\mono\metadata\opcodes.c" />
- <ClCompile Include="..\mono\metadata\profiler.c" />
- <ClCompile Include="..\mono\metadata\rand.c" />
- <ClCompile Include="..\mono\metadata\reflection.c" />
- <ClCompile Include="..\mono\metadata\remoting.c" />
- <ClCompile Include="..\mono\metadata\runtime.c" />
- <ClCompile Include="..\mono\metadata\security-core-clr.c" />
- <ClCompile Include="..\mono\metadata\security-manager.c" />
- <ClCompile Include="..\mono\metadata\mono-security.c" />
- <ClCompile Include="..\mono\metadata\seq-points-data.c" />
- <ClCompile Include="..\mono\metadata\sgen-mono.c" />
- <ClCompile Include="..\mono\metadata\threadpool-io.c" />
- <ClCompile Include="..\mono\metadata\threadpool.c" />
- <ClCompile Include="..\mono\metadata\threadpool-worker-default.c" />
- <ClCompile Include="..\mono\metadata\sgen-bridge.c" />
- <ClCompile Include="..\mono\metadata\sgen-new-bridge.c" />
- <ClCompile Include="..\mono\metadata\sgen-old-bridge.c" />
- <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c" />
- <ClCompile Include="..\mono\metadata\sgen-toggleref.c" />
- <ClCompile Include="..\mono\metadata\sgen-stw.c" />
- <ClCompile Include="..\mono\metadata\w32socket.c" />
- <ClCompile Include="..\mono\metadata\sre.c" />
- <ClCompile Include="..\mono\metadata\sre-encode.c" />
- <ClCompile Include="..\mono\metadata\sre-save.c" />
- <ClCompile Include="..\mono\metadata\string-icalls.c" />
- <ClCompile Include="..\mono\metadata\sysmath.c" />
- <ClCompile Include="..\mono\metadata\threads.c" />
- <ClCompile Include="..\mono\metadata\verify.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\metadata\appdomain.h" />
- <ClInclude Include="..\mono\metadata\appdomain-icalls.h" />
- <ClInclude Include="..\mono\metadata\assembly.h" />
- <ClInclude Include="..\mono\metadata\attach.h" />
- <ClInclude Include="..\mono\metadata\callspec.h" />
- <ClInclude Include="..\mono\metadata\cil-coff.h" />
- <ClInclude Include="..\mono\metadata\class-internals.h" />
- <ClInclude Include="..\mono\metadata\class.h" />
- <ClInclude Include="..\mono\metadata\cominterop-win32-internals.h" />
- <ClInclude Include="..\mono\metadata\cominterop.h" />
- <ClInclude Include="..\mono\metadata\console-io.h" />
- <ClInclude Include="..\mono\metadata\console-win32-internals.h" />
- <ClInclude Include="..\mono\metadata\coree-internals.h" />
- <ClInclude Include="..\mono\metadata\coree.h" />
- <ClInclude Include="..\mono\metadata\culture-info-tables.h" />
- <ClInclude Include="..\mono\metadata\culture-info.h" />
- <ClInclude Include="..\mono\metadata\custom-attrs-internals.h" />
- <ClInclude Include="..\mono\metadata\debug-helpers.h" />
- <ClInclude Include="..\mono\metadata\debug-mono-ppdb.h" />
- <ClInclude Include="..\mono\metadata\debug-mono-symfile.h" />
- <ClInclude Include="..\mono\metadata\domain-internals.h" />
- <ClInclude Include="..\mono\metadata\dynamic-image-internals.h" />
- <ClInclude Include="..\mono\metadata\dynamic-stream-internals.h" />
- <ClInclude Include="..\mono\metadata\environment.h" />
- <ClInclude Include="..\mono\metadata\exception.h" />
- <ClInclude Include="..\mono\metadata\w32file-internals.h" />
- <ClInclude Include="..\mono\metadata\w32file-win32-internals.h" />
- <ClInclude Include="..\mono\metadata\w32file.h" />
- <ClInclude Include="..\mono\metadata\w32error.h" />
- <ClInclude Include="..\mono\utils\w32api.h" />
- <ClInclude Include="..\mono\metadata\filewatcher.h" />
- <ClInclude Include="..\mono\metadata\gc-internals.h" />
- <ClInclude Include="..\mono\metadata\handle.h" />
- <ClInclude Include="..\mono\metadata\icall-windows-internals.h" />
- <ClInclude Include="..\mono\metadata\icall-internals.h" />
- <ClInclude Include="..\mono\metadata\marshal-internals.h" />
- <ClInclude Include="..\mono\metadata\marshal-windows-internals.h" />
- <ClInclude Include="..\mono\metadata\mono-security-windows-internals.h" />
- <ClInclude Include="..\mono\metadata\number-ms.h" />
- <ClInclude Include="..\mono\metadata\property-bag.h" />
- <ClInclude Include="..\mono\metadata\w32process.h" />
- <ClInclude Include="..\mono\metadata\w32process-internals.h" />
- <ClInclude Include="..\mono\metadata\w32process-win32-internals.h" />
- <ClInclude Include="..\mono\metadata\remoting.h" />
- <ClInclude Include="..\mono\metadata\seq-points-data.h" />
- <ClInclude Include="..\mono\metadata\sgen-bridge-internals.h" />
- <ClInclude Include="..\mono\metadata\sgen-client-mono.h" />
- <ClInclude Include="..\mono\metadata\w32socket-internals.h" />
- <ClInclude Include="..\mono\metadata\threadpool-io.h" />
- <ClInclude Include="..\mono\metadata\threadpool.h" />
- <ClInclude Include="..\mono\metadata\threadpool-worker.h" />
- <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h" />
- <ClInclude Include="..\mono\metadata\icall-def.h" />
- <ClInclude Include="..\mono\metadata\image.h" />
- <ClInclude Include="..\mono\metadata\loader.h" />
- <ClInclude Include="..\mono\metadata\locales.h" />
- <ClInclude Include="..\mono\metadata\lock-tracer.h" />
- <ClInclude Include="..\mono\metadata\marshal.h" />
- <ClInclude Include="..\mono\metadata\mempool-internals.h" />
- <ClInclude Include="..\mono\metadata\mempool.h" />
- <ClInclude Include="..\mono\metadata\metadata-internals.h" />
- <ClInclude Include="..\mono\metadata\metadata.h" />
- <ClInclude Include="..\mono\metadata\method-builder.h" />
- <ClInclude Include="..\mono\metadata\monitor.h" />
- <ClInclude Include="..\mono\metadata\mono-basic-block.h" />
- <ClInclude Include="..\mono\metadata\mono-config.h" />
- <ClInclude Include="..\mono\metadata\mono-config-dirs.h" />
- <ClInclude Include="..\mono\metadata\mono-debug-debugger.h" />
- <ClInclude Include="..\mono\metadata\mono-debug.h" />
- <ClInclude Include="..\mono\metadata\mono-endian.h" />
- <ClInclude Include="..\mono\metadata\mono-hash.h" />
- <ClInclude Include="..\mono\metadata\mono-conc-hash.h" />
- <ClInclude Include="..\mono\metadata\mono-mlist.h" />
- <ClInclude Include="..\mono\metadata\mono-perfcounters-def.h" />
- <ClInclude Include="..\mono\metadata\mono-perfcounters.h" />
- <ClInclude Include="..\mono\metadata\mono-ptr-array.h" />
- <ClInclude Include="..\mono\metadata\normalization-tables.h" />
- <ClInclude Include="..\mono\metadata\number-formatter.h" />
- <ClInclude Include="..\mono\metadata\object-internals.h" />
- <ClInclude Include="..\mono\metadata\object.h" />
- <ClInclude Include="..\mono\metadata\opcodes.h" />
- <ClInclude Include="..\mono\metadata\profiler-events.h" />
- <ClInclude Include="..\mono\metadata\profiler-private.h" />
- <ClInclude Include="..\mono\metadata\profiler.h" />
- <ClInclude Include="..\mono\metadata\rand.h" />
- <ClInclude Include="..\mono\metadata\reflection.h" />
- <ClInclude Include="..\mono\metadata\reflection-cache.h" />
- <ClInclude Include="..\mono\metadata\reflection-internals.h" />
- <ClInclude Include="..\mono\metadata\runtime.h" />
- <ClInclude Include="..\mono\metadata\security-core-clr.h" />
- <ClInclude Include="..\mono\metadata\security-manager.h" />
- <ClInclude Include="..\mono\metadata\security.h" />
- <ClInclude Include="..\mono\metadata\sgen-bridge.h" />
- <ClInclude Include="..\mono\metadata\sgen-toggleref.h" />
- <ClInclude Include="..\mono\metadata\w32socket.h" />
- <ClInclude Include="..\mono\metadata\sre-internals.h" />
- <ClInclude Include="..\mono\metadata\string-icalls.h" />
- <ClInclude Include="..\mono\metadata\sysmath.h" />
- <ClInclude Include="..\mono\metadata\tabledefs.h" />
- <ClInclude Include="..\mono\metadata\threads-types.h" />
- <ClInclude Include="..\mono\metadata\verify-internals.h" />
- <ClInclude Include="..\mono\metadata\verify.h" />
- <ClInclude Include="..\mono\metadata\wrapper-types.h" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="..\mono\metadata\Makefile.am" />
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C36612BD-22D3-4B95-85E2-7FDC4FC5D739}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@@ -301,10 +100,10 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -318,10 +117,10 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -334,12 +133,11 @@ <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -354,12 +152,11 @@ <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -369,7 +166,8 @@ </Link>
<Lib />
</ItemDefinitionGroup>
+ <Import Project="libmonoruntime.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/libmonoruntime.vcxproj.filters b/msvc/libmonoruntime.vcxproj.filters index ce8d2a1b1b1..3ac14af4471 100644 --- a/msvc/libmonoruntime.vcxproj.filters +++ b/msvc/libmonoruntime.vcxproj.filters @@ -1,585 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\mono\metadata\assembly.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\attach.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\class.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\cominterop.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\console-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32mutex-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32semaphore-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32event-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\coree.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\debug-helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\debug-mono-ppdb.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\debug-mono-symfile.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\decimal-ms.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\environment.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\exception.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32file.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\file-mmap-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\filewatcher.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\handle.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\icall.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\image.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\jit-info.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\loader.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\locales.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\lock-tracer.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\marshal.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mempool.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\metadata.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\metadata-verify.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\method-builder.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-basic-block.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-config.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-config-dirs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-debug.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-endian.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-mlist.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-perfcounters.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-security.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\null-gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\number-ms.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\opcodes.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32process.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32process-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\profiler.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\rand.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\remoting.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\runtime.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\security-core-clr.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\security-manager.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\seq-points-data.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32socket.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\string-icalls.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sysmath.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\threadpool.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\threadpool-worker-default.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\threadpool-io.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\threads.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\verify.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\boehm-gc.c">
- <Filter>Source Files\boehm</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\appdomain.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\domain.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\gc-stats.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\gc.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\monitor.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-hash.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-conc-hash.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\object.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\reflection.c">
- <Filter>Source Files\gc</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-bridge.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-old-bridge.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-new-bridge.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-toggleref.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-stw.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-mono.c">
- <Filter>Source Files\sgen</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\metadata-cross-helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\custom-attrs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\dynamic-image.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\dynamic-stream.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sre.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sre-encode.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sre-save.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32socket-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32file-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\w32error-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\icall-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\marshal-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-security-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\class-accessors.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\property-bag.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\metadata\appdomain.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\assembly.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\attach.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\cil-coff.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\class.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\class-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\cominterop.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\console-io.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\coree.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\culture-info.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\culture-info-tables.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\debug-helpers.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\debug-mono-ppdb.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\debug-mono-symfile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\domain-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\environment.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\exception.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32file.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32error.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\w32api.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\filewatcher.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\handle.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\icall-def.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\image.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\loader.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\locales.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\lock-tracer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\marshal.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mempool.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mempool-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\metadata.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\metadata-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\method-builder.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\monitor.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-basic-block.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-config.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-config-dirs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-debug.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-debug-debugger.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-endian.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-hash.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-conc-hash.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-mlist.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-perfcounters.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-perfcounters-def.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-ptr-array.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\normalization-tables.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\number-formatter.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\number-ms.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\object.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\object-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\opcodes.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32process.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32process-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32process-win32-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\profiler-events.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\profiler-private.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\profiler.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\rand.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\reflection.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\remoting.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\runtime.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\security.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\security-core-clr.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\security-manager.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\seq-points-data.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32socket.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\string-icalls.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sysmath.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\tabledefs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\threadpool.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\threadpool-worker.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\wrapper-types.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\threadpool-io.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\threads-types.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\verify.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\verify-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-bridge.h">
- <Filter>Header Files\sgen</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-bridge-internals.h">
- <Filter>Header Files\sgen</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-toggleref.h">
- <Filter>Header Files\sgen</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-client-mono.h">
- <Filter>Header Files\sgen</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h">
- <Filter>Header Files\gc</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\gc-internals.h">
- <Filter>Header Files\gc</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\custom-attrs-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\dynamic-image-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\dynamic-stream-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\reflection-cache.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\reflection-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sre-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32socket-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\coree-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\console-win32-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32file-win32-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\w32file-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\icall-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\icall-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\marshal-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\marshal-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\mono-security-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\property-bag.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\cominterop-win32-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\appdomain-icalls.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
+ <Import Project="libmonoruntime.targets.filters" />
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{eb8a6a4d-924c-494d-99c1-663e4c09a806}</UniqueIdentifier>
@@ -590,28 +11,5 @@ <Filter Include="Source Files">
<UniqueIdentifier>{3f4ff222-41cc-4bbc-b36b-cac0c21266ad}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\boehm">
- <UniqueIdentifier>{728e57f8-14d3-42f4-b92a-be03cd2acdfa}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\sgen">
- <UniqueIdentifier>{d5996ea0-8b43-4267-a46c-715270aaee2b}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\boehm">
- <UniqueIdentifier>{2446a0bf-5f8b-4789-91ab-6107f72b8539}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\sgen">
- <UniqueIdentifier>{5fede250-d478-466b-aa2a-36d2222de065}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\gc">
- <UniqueIdentifier>{410dd556-6715-4c4e-beff-c5dd7a6b78a1}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\gc">
- <UniqueIdentifier>{e37c9a88-bfb3-47dd-948c-a74dea25b3ad}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\mono\metadata\Makefile.am">
- <Filter>Resource Files</Filter>
- </None>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/libmonoutils.targets b/msvc/libmonoutils.targets new file mode 100644 index 00000000000..50865a483fe --- /dev/null +++ b/msvc/libmonoutils.targets @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-codeman.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h" /> + </ItemGroup> + <ItemGroup> + <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm"> + <FileType>Document</FileType> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <PreprocessorDefinitions>X64</PreprocessorDefinitions> + </MASM> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" /> + </ItemGroup> + <ImportGroup Label="ExtensionSettings"> + <Import Project="$(MonoSourceLocation)\msvc\masm.fixed.props" /> + <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" /> + </ImportGroup> +</Project> diff --git a/msvc/libmonoutils.targets.filters b/msvc/libmonoutils.targets.filters new file mode 100644 index 00000000000..50154182a4e --- /dev/null +++ b/msvc/libmonoutils.targets.filters @@ -0,0 +1,451 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-codeman.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c"> + <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h"> + <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm"> + <Filter>Resource Files$(MonoUtilsFilterSubFolder)</Filter> + </MASM> + </ItemGroup> + <ItemGroup> + <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am"> + <Filter>Resource Files$(MonoUtilsFilterSubFolder)</Filter> + </None> + </ItemGroup> + <ItemGroup Condition="'$(MonoUtilsFilterSubFolder)'!=''"> + <Filter Include="Header Files$(MonoUtilsFilterSubFolder)"> + <UniqueIdentifier>{CFB7113E-BF38-420B-ADCE-D737EDD7C91A}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)"> + <UniqueIdentifier>{CF1B494F-7FC7-4B1F-9356-1E6F4C3AA151}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoUtilsFilterSubFolder)"> + <UniqueIdentifier>{6603FB44-3F5A-490C-A2FB-3FCD4818EA6A}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project> diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index beba4278b8e..fd727132bc6 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -19,200 +19,10 @@ </ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\mono\utils\dlmalloc.c" />
- <ClCompile Include="..\mono\utils\hazard-pointer.c" />
- <ClCompile Include="..\mono\utils\json.c" />
- <ClCompile Include="..\mono\utils\lock-free-alloc.c" />
- <ClCompile Include="..\mono\utils\lock-free-array-queue.c" />
- <ClCompile Include="..\mono\utils\lock-free-queue.c" />
- <ClCompile Include="..\mono\utils\mach-support-amd64.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support-arm.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support-x86.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-codeman.c" />
- <ClCompile Include="..\mono\utils\mono-conc-hashtable.c" />
- <ClCompile Include="..\mono\utils\mono-context.c" />
- <ClCompile Include="..\mono\utils\mono-counters.c" />
- <ClCompile Include="..\mono\utils\mono-dl-windows.c" />
- <ClCompile Include="..\mono\utils\mono-dl.c" />
- <ClCompile Include="..\mono\utils\mono-error.c" />
- <ClCompile Include="..\mono\utils\mono-filemap.c" />
- <ClCompile Include="..\mono\utils\mono-internal-hash.c" />
- <ClCompile Include="..\mono\utils\mono-io-portability.c" />
- <ClCompile Include="..\mono\utils\mono-linked-list-set.c" />
- <ClCompile Include="..\mono\utils\mono-logger.c" />
- <ClCompile Include="..\mono\utils\mono-log-windows.c" />
- <ClCompile Include="..\mono\utils\mono-log-common.c" />
- <ClCompile Include="..\mono\utils\mono-math.c" />
- <ClCompile Include="..\mono\utils\mono-md5.c" />
- <ClCompile Include="..\mono\utils\mono-mmap-windows.c" />
- <ClCompile Include="..\mono\utils\mono-mmap.c" />
- <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />
- <ClCompile Include="..\mono\utils\mono-os-wait-win32.c" />
- <ClCompile Include="..\mono\utils\mono-proclib-windows.c" />
- <ClCompile Include="..\mono\utils\mono-rand-windows.c" />
- <ClCompile Include="..\mono\utils\mono-rand.c" />
- <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />
- <ClCompile Include="..\mono\utils\networking.c" />
- <ClCompile Include="..\mono\utils\networking-posix.c" />
- <ClCompile Include="..\mono\utils\networking-missing.c" />
- <ClCompile Include="..\mono\utils\networking-windows.c" />
- <ClCompile Include="..\mono\utils\mono-path.c" />
- <ClCompile Include="..\mono\utils\mono-poll.c" />
- <ClCompile Include="..\mono\utils\mono-proclib.c" />
- <ClCompile Include="..\mono\utils\mono-property-hash.c" />
- <ClCompile Include="..\mono\utils\mono-publib.c" />
- <ClCompile Include="..\mono\utils\mono-sha1.c" />
- <ClCompile Include="..\mono\utils\mono-stdlib.c" />
- <ClCompile Include="..\mono\utils\mono-threads-mach.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-posix.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-windows.c" />
- <ClCompile Include="..\mono\utils\mono-threads.c" />
- <ClCompile Include="..\mono\utils\mono-threads-coop.c" />
- <ClCompile Include="..\mono\utils\mono-time.c" />
- <ClCompile Include="..\mono\utils\mono-tls.c" />
- <ClCompile Include="..\mono\utils\mono-uri.c" />
- <ClCompile Include="..\mono\utils\mono-value-hash.c" />
- <ClCompile Include="..\mono\utils\monobitset.c" />
- <ClCompile Include="..\mono\utils\mono-os-mutex.c" />
- <ClCompile Include="..\mono\utils\os-event-win32.c" />
- <ClCompile Include="..\mono\utils\strenc.c" />
- <ClCompile Include="..\mono\utils\atomic.c" />
- <ClCompile Include="..\mono\utils\mono-hwcap.c" />
- <ClCompile Include="..\mono\utils\mono-hwcap-x86.c" />
- <ClCompile Include="..\mono\utils\bsearch.c" />
- <ClCompile Include="..\mono\utils\memfuncs.c" />
- <ClCompile Include="..\mono\utils\parse.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\utils\dlmalloc.h" />
- <ClInclude Include="..\mono\utils\dtrace.h" />
- <ClInclude Include="..\mono\utils\freebsd-dwarf.h" />
- <ClInclude Include="..\mono\utils\freebsd-elf32.h" />
- <ClInclude Include="..\mono\utils\freebsd-elf64.h" />
- <ClInclude Include="..\mono\utils\freebsd-elf_common.h" />
- <ClInclude Include="..\mono\utils\gc_wrapper.h" />
- <ClInclude Include="..\mono\utils\hazard-pointer.h" />
- <ClInclude Include="..\mono\utils\json.h" />
- <ClInclude Include="..\mono\utils\linux_magic.h" />
- <ClInclude Include="..\mono\utils\lock-free-alloc.h" />
- <ClInclude Include="..\mono\utils\lock-free-array-queue.h" />
- <ClInclude Include="..\mono\utils\lock-free-queue.h" />
- <ClInclude Include="..\mono\utils\mach-support.h" />
- <ClInclude Include="..\mono\utils\memcheck.h" />
- <ClInclude Include="..\mono\utils\mono-codeman.h" />
- <ClInclude Include="..\mono\utils\mono-compiler.h" />
- <ClInclude Include="..\mono\utils\mono-complex.h" />
- <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />
- <ClInclude Include="..\mono\utils\mono-context.h" />
- <ClInclude Include="..\mono\utils\mono-coop-mutex.h" />
- <ClInclude Include="..\mono\utils\mono-coop-semaphore.h" />
- <ClInclude Include="..\mono\utils\mono-counters.h" />
- <ClInclude Include="..\mono\utils\mono-digest.h" />
- <ClInclude Include="..\mono\utils\mono-dl-fallback.h" />
- <ClInclude Include="..\mono\utils\mono-dl-windows-internals.h" />
- <ClInclude Include="..\mono\utils\mono-dl.h" />
- <ClInclude Include="..\mono\utils\mono-error-internals.h" />
- <ClInclude Include="..\mono\utils\mono-error.h" />
- <ClInclude Include="..\mono\utils\mono-internal-hash.h" />
- <ClInclude Include="..\mono\utils\mono-io-portability.h" />
- <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />
- <ClInclude Include="..\mono\utils\mono-logger-internals.h" />
- <ClInclude Include="..\mono\utils\mono-logger.h" />
- <ClInclude Include="..\mono\utils\mono-machine.h" />
- <ClInclude Include="..\mono\utils\mono-math.h" />
- <ClInclude Include="..\mono\utils\mono-membar.h" />
- <ClInclude Include="..\mono\utils\mono-memory-model.h" />
- <ClInclude Include="..\mono\utils\mono-mmap-internals.h" />
- <ClInclude Include="..\mono\utils\mono-mmap-windows-internals.h" />
- <ClInclude Include="..\mono\utils\mono-mmap.h" />
- <ClInclude Include="..\mono\utils\mono-networkinterfaces.h" />
- <ClInclude Include="..\mono\utils\mono-once.h" />
- <ClInclude Include="..\mono\utils\mono-os-mutex.h" />
- <ClInclude Include="..\mono\utils\mono-os-semaphore.h" />
- <ClInclude Include="..\mono\utils\mono-os-wait.h" />
- <ClInclude Include="..\mono\utils\mono-path.h" />
- <ClInclude Include="..\mono\utils\mono-poll.h" />
- <ClInclude Include="..\mono\utils\mono-proclib-windows-internals.h" />
- <ClInclude Include="..\mono\utils\mono-proclib.h" />
- <ClInclude Include="..\mono\utils\mono-property-hash.h" />
- <ClInclude Include="..\mono\utils\mono-publib.h" />
- <ClInclude Include="..\mono\utils\mono-rand-windows-internals.h" />
- <ClInclude Include="..\mono\utils\mono-rand.h" />
- <ClInclude Include="..\mono\utils\mono-sigcontext.h" />
- <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />
- <ClInclude Include="..\mono\utils\mono-stdlib.h" />
- <ClInclude Include="..\mono\utils\mono-string.h" />
- <ClInclude Include="..\mono\utils\mono-threads.h" />
- <ClInclude Include="..\mono\utils\mono-threads-api.h" />
- <ClInclude Include="..\mono\utils\mono-threads-coop.h" />
- <ClInclude Include="..\mono\utils\mono-time.h" />
- <ClInclude Include="..\mono\utils\mono-tls.h" />
- <ClInclude Include="..\mono\utils\mono-uri.h" />
- <ClInclude Include="..\mono\utils\mono-value-hash.h" />
- <ClInclude Include="..\mono\utils\monobitset.h" />
- <ClInclude Include="..\mono\utils\os-event.h" />
- <ClInclude Include="..\mono\utils\strenc.h" />
- <ClInclude Include="..\mono\utils\valgrind.h" />
- <ClInclude Include="..\mono\utils\atomic.h" />
- <ClInclude Include="..\mono\utils\unlocked.h" />
- <ClInclude Include="..\mono\utils\mono-hwcap.h" />
- <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
- <ClInclude Include="..\mono\utils\bsearch.h" />
- <ClInclude Include="..\mono\utils\memfuncs.h" />
- <ClInclude Include="..\mono\utils\parse.h" />
- </ItemGroup>
- <ItemGroup>
- <MASM Include="..\mono\utils\win64.asm">
- <FileType>Document</FileType>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </MASM>
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <None Include="..\mono\utils\Makefile.am" />
- </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@@ -245,9 +55,6 @@ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- <Import Project=".\masm.fixed.props" />
- </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="mono.props" />
@@ -289,8 +96,8 @@ <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -307,10 +114,10 @@ </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -320,21 +127,17 @@ <Command>
</Command>
</PreBuildEvent>
- <MASM>
- <PreprocessorDefinitions>X64</PreprocessorDefinitions>
- </MASM>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -352,12 +155,11 @@ <WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -369,12 +171,7 @@ <Command>
</Command>
</PreBuildEvent>
- <MASM>
- <PreprocessorDefinitions>X64</PreprocessorDefinitions>
- </MASM>
</ItemDefinitionGroup>
+ <Import Project="libmonoutils.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
- </ImportGroup>
</Project>
\ No newline at end of file diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters index e4b82690a18..def4467d313 100644 --- a/msvc/libmonoutils.vcxproj.filters +++ b/msvc/libmonoutils.vcxproj.filters @@ -1,432 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\mono\utils\atomic.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\bsearch.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\dlmalloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\hazard-pointer.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\json.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\lock-free-alloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\lock-free-array-queue.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\lock-free-queue.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support-amd64.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support-arm.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mach-support-x86.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\memfuncs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\monobitset.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-codeman.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-conc-hashtable.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-context.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-counters.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-dl.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-dl-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-error.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-filemap.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-hwcap.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-hwcap-x86.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-internal-hash.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-io-portability.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-linked-list-set.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-logger.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-math.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-md5.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-mmap.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-networkinterfaces.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-path.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-poll.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-proclib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-property-hash.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-publib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-rand.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-sha1.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-stdlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-coop.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-mach.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-posix.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-state-machine.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-threads-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-time.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-tls.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-uri.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-value-hash.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\networking.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\networking-missing.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\networking-posix.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\networking-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\parse.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\strenc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-log-common.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-log-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-rand-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-proclib-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-mmap-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\os-event-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-os-mutex.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-os-wait-win32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\mono\utils\atomic.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\bsearch.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\dlmalloc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\dtrace.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\freebsd-dwarf.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\freebsd-elf_common.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\freebsd-elf32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\freebsd-elf64.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\gc_wrapper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\hazard-pointer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\json.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\linux_magic.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\lock-free-alloc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\lock-free-array-queue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\lock-free-queue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mach-support.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\memcheck.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\memfuncs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\monobitset.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-codeman.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-compiler.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-complex.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-conc-hashtable.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-context.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-coop-mutex.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-coop-semaphore.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-counters.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-digest.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-dl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-dl-fallback.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-error.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-error-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-hwcap.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-hwcap-x86.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-internal-hash.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-io-portability.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-linked-list-set.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-logger.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-logger-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-machine.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-math.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-membar.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-memory-model.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-mmap.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-networkinterfaces.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-once.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-os-mutex.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-os-semaphore.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-path.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-poll.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-proclib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-property-hash.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-publib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-rand.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-sigcontext.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-stack-unwinding.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-stdlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-string.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-threads.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-threads-api.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-threads-coop.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-time.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-tls.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-uri.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-value-hash.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\parse.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\strenc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\valgrind.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-mmap-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-mmap-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-proclib-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-rand-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-dl-windows-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\os-event.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\unlocked.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\utils\mono-os-wait.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
+ <Import Project="libmonoutils.targets.filters" />
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{7d1240fd-7e95-4e21-ab1a-365dd69355de}</UniqueIdentifier>
@@ -438,14 +12,4 @@ <UniqueIdentifier>{82f9c5a2-bc7b-4424-ae85-a203027fd038}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <MASM Include="..\mono\utils\win64.asm">
- <Filter>Resource Files</Filter>
- </MASM>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\mono\utils\Makefile.am">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/msvc/libtest.vcxproj b/msvc/libtest.vcxproj index 27a44e3ae8c..a6d25fbb2b1 100644 --- a/msvc/libtest.vcxproj +++ b/msvc/libtest.vcxproj @@ -75,10 +75,8 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -86,11 +84,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -98,13 +94,9 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -116,11 +108,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -128,21 +118,18 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -150,15 +137,9 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -166,13 +147,13 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -180,12 +161,7 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -195,9 +171,6 @@ <ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/msvc/mono.props b/msvc/mono.props index 22b1d59fec2..42c56e0f178 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <!-- Change this to custom build tree location to enable out of source tree builds, example c:/mono-build/ --> @@ -55,7 +55,7 @@ <MONO_BUILD_DIR_PREFIX Condition="'$(MONO_USE_SEPARATE_BUILD_DIR)'=='true'">$(MONO_BUILD_DIR_PREFIX)boehm/</MONO_BUILD_DIR_PREFIX> </PropertyGroup> <PropertyGroup Label="Static-Mono-Libraries"> - <MONO_RUNTIME_LIBS>libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;$(GC_LIB)</MONO_RUNTIME_LIBS> + <MONO_RUNTIME_LIBS>libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmini$(MONO_TARGET_SUFFIX).lib;$(GC_LIB)</MONO_RUNTIME_LIBS> <MONO_STATIC_LIBMONO_LIB>libmono-static$(MONO_TARGET_SUFFIX).lib</MONO_STATIC_LIBMONO_LIB> <MONO_DYNAMIC_LIBMONO_LIB>mono-2.0$(MONO_TARGET_SUFFIX).lib</MONO_DYNAMIC_LIBMONO_LIB> </PropertyGroup> @@ -107,4 +107,4 @@ <AdditionalLibraryDirectories>$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)</AdditionalLibraryDirectories> </Lib> </ItemDefinitionGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/msvc/mono.sln b/msvc/mono.sln index 4a8ecd3326e..ac103fb6ea6 100644 --- a/msvc/mono.sln +++ b/msvc/mono.sln @@ -16,34 +16,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmdesc", "genmdesc.vcxpro {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "libmono.vcxproj", "{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}"
- ProjectSection(ProjectDependencies) = postProject
- {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {EB56000B-C80B-4E8B-908D-D84D31B517D3}
- {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {C36612BD-22D3-4B95-85E2-7FDC4FC5D739}
- {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} = {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}
- {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
- {B7098DFA-31E6-4006-8A15-1C9A4E925149} = {B7098DFA-31E6-4006-8A15-1C9A4E925149}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-invoke", "test-invoke.vcxproj", "{C5639B3F-288A-4A4B-A4A5-C0D85834221D}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teste", "teste.vcxproj", "{6FDE4E5E-57D0-432F-A987-6C226A7827E4}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono", "mono.vcxproj", "{A0EDDCD9-940F-432C-A28F-7EF322437D79}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
@@ -55,28 +42,24 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monodis", "monodis.vcxproj", "{37F50E5A-4818-46CF-81FE-4BB06DE5D42E}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pedump", "pedump.vcxproj", "{84C7DB50-D6F8-4C47-B22C-6BB203AEB4D3}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monograph", "monograph.vcxproj", "{CA2A69D6-3B9D-45A5-8BF7-4E242E683122}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-metadata", "test-metadata.vcxproj", "{C2EB666E-9146-4B7A-85F6-25F9EA313770}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
@@ -88,14 +71,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_eglib", "test_eglib.vcxproj", "{80A0620A-3478-4E1A-AA7C-0D2387B892AB}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest", "libtest.vcxproj", "{5A435710-E6D2-4DD4-9B3F-A7239A32C6F4}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
@@ -115,7 +96,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-vtune", "profiler-vtune.vcxproj", "{F51017F9-B7FB-4F87-B7B5-12799D965783}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
@@ -147,7 +127,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-all", "build-all.vcxp {37F50E5A-4818-46CF-81FE-4BB06DE5D42E} = {37F50E5A-4818-46CF-81FE-4BB06DE5D42E}
{6FDE4E5E-57D0-432F-A987-6C226A7827E4} = {6FDE4E5E-57D0-432F-A987-6C226A7827E4}
{C2EB666E-9146-4B7A-85F6-25F9EA313770} = {C2EB666E-9146-4B7A-85F6-25F9EA313770}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {C36612BD-22D3-4B95-85E2-7FDC4FC5D739}
{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} = {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}
{CA2A69D6-3B9D-45A5-8BF7-4E242E683122} = {CA2A69D6-3B9D-45A5-8BF7-4E242E683122}
@@ -212,6 +191,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-nunit-test", "mono-nun EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmonodac", "libmonodac.vcxproj", "{DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmini", "libmini.vcxproj", "{88D2EB79-592D-45F8-B849-AE021C1D983A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono-dynamic", "libmono-dynamic.vcxproj", "{675F4175-FFB1-480D-AD36-F397578844D4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -228,14 +211,6 @@ Global {B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|Win32.Build.0 = Release|Win32
{B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|x64.ActiveCfg = Release|x64
{B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|x64.Build.0 = Release|x64
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Win32.ActiveCfg = Debug|Win32
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Win32.Build.0 = Debug|Win32
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|x64.ActiveCfg = Debug|x64
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|x64.Build.0 = Debug|x64
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Win32.ActiveCfg = Release|Win32
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Win32.Build.0 = Release|Win32
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|x64.ActiveCfg = Release|x64
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|x64.Build.0 = Release|x64
{C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|Win32.ActiveCfg = Debug|Win32
{C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|Win32.Build.0 = Debug|Win32
{C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|x64.ActiveCfg = Debug|x64
@@ -420,13 +395,28 @@ Global {DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|Win32.ActiveCfg = Release|x64
{DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|x64.ActiveCfg = Release|x64
{DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|x64.Build.0 = Release|x64
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|Win32.Build.0 = Debug|Win32
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|x64.ActiveCfg = Debug|x64
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|x64.Build.0 = Debug|x64
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|Win32.ActiveCfg = Release|Win32
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|Win32.Build.0 = Release|Win32
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|x64.ActiveCfg = Release|x64
+ {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|x64.Build.0 = Release|x64
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|Win32.Build.0 = Debug|Win32
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|x64.ActiveCfg = Debug|x64
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|x64.Build.0 = Debug|x64
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Release|Win32.ActiveCfg = Release|Win32
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Release|Win32.Build.0 = Release|Win32
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Release|x64.ActiveCfg = Release|x64
+ {675F4175-FFB1-480D-AD36-F397578844D4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B7098DFA-31E6-4006-8A15-1C9A4E925149} = {EE2CC761-9652-44AC-9204-7EB31194CAA6}
- {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}
{C5639B3F-288A-4A4B-A4A5-C0D85834221D} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC}
{6FDE4E5E-57D0-432F-A987-6C226A7827E4} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC}
{A0EDDCD9-940F-432C-A28F-7EF322437D79} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}
@@ -457,11 +447,13 @@ Global {7BECCFA0-28A0-4995-9856-558560F720E6} = {A0068765-334B-414C-8E21-8376CD2EC9F6}
{0046B994-40A8-4C64-AC9D-429DC9177B54} = {A0068765-334B-414C-8E21-8376CD2EC9F6}
{DC50997D-8A0D-4EB6-849B-9D7FBC39CE53} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}
+ {88D2EB79-592D-45F8-B849-AE021C1D983A} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1}
+ {675F4175-FFB1-480D-AD36-F397578844D4} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- AMDCaPersistentConfig = Debug|Win32
- AMDCaPersistentStartup = mono
AMDCaProjectFile = C:\Users\Owner\Development\monogit\mono\msvc\CodeAnalyst\mono.caw
+ AMDCaPersistentStartup = mono
+ AMDCaPersistentConfig = Debug|Win32
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index 59cf0bd1b83..0c3eba152b2 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -77,11 +77,9 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -96,25 +94,20 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<ProjectReference />
<Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -127,14 +120,12 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level3</WarningLevel>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -142,22 +133,20 @@ <Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
<ShowProgress>
</ShowProgress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <WarningLevel>Level3</WarningLevel>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -166,13 +155,8 @@ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -180,13 +164,13 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
+ <WarningLevel>Level3</WarningLevel>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -194,11 +178,7 @@ <Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -208,8 +188,8 @@ <ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index c7afb945a20..9f0bb69efb9 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -98,12 +96,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -112,37 +107,29 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <StringPooling>true</StringPooling>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -155,12 +142,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -169,10 +153,7 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- <ShowProgress>NotSet</ShowProgress>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -180,24 +161,20 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <StringPooling>true</StringPooling>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -220,17 +197,8 @@ <ClInclude Include="..\mono\dis\util.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libgc.vcxproj">
- <Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
- </ProjectReference>
- <ProjectReference Include="libgcmonosgen.vcxproj">
- <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-static.vcxproj">
+ <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0772}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index db342010c2f..022665893f8 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -98,12 +96,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -112,37 +107,29 @@ <Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -155,12 +142,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -169,9 +153,7 @@ <Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -179,24 +161,20 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -208,8 +186,8 @@ <ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/monoposixhelper.targets b/msvc/monoposixhelper.targets new file mode 100644 index 00000000000..4a00ec1f344 --- /dev/null +++ b/msvc/monoposixhelper.targets @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\support\adler32.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\compress.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\crc32.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\deflate.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\errno.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\fcntl.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\infback.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\inffast.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\inflate.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\inftrees.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\map.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\ioapi.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\iowin32.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\minizip.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\unzip.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\zip.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\signal.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\stdio.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\stdlib.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\string.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\sys-stat.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\trees.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\uncompr.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\zlib-helper.c" /> + <ClCompile Include="$(MonoSourceLocation)\support\zutil.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\support\inffast.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\crc32.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\deflate.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\inffixed.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\inflate.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\inftrees.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\map.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\crypt.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\ioapi.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\iowin32.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\unzip.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\zip.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\mph.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\trees.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\zconf.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\zlib.h" /> + <ClInclude Include="$(MonoSourceLocation)\support\zutil.h" /> + </ItemGroup> + <ItemGroup> + <None Include="monoposixhelper.def" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/monoposixhelper.targets.filters b/msvc/monoposixhelper.targets.filters new file mode 100644 index 00000000000..e82ea140796 --- /dev/null +++ b/msvc/monoposixhelper.targets.filters @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(MonoSourceLocation)\support\adler32.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\compress.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\crc32.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\deflate.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\errno.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\infback.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\inffast.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\inflate.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\inftrees.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\map.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\signal.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\stdio.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\stdlib.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\string.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\trees.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\uncompr.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\zlib-helper.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\zutil.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\iowin32.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\minizip.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\unzip.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\zip.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\minizip\ioapi.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\fcntl.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + <ClCompile Include="$(MonoSourceLocation)\support\sys-stat.c"> + <Filter>Source Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MonoSourceLocation)\support\crc32.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\deflate.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\inffast.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\inffixed.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\inflate.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\inftrees.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\map.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\mph.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\trees.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\zconf.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\zutil.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\crypt.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\unzip.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\iowin32.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\zip.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\zlib.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\support\minizip\ioapi.h"> + <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <None Include="monoposixhelper.def"> + <Filter>Resource Files$(MonoPosixHelperFilterSubFolder)</Filter> + </None> + </ItemGroup> + <ItemGroup Condition="'$(MonoPosixHelperFilterSubFolder)'!=''"> + <Filter Include="Header Files$(MonoPosixHelperFilterSubFolder)"> + <UniqueIdentifier>{BFBB15BB-C843-4A56-8909-B832B33FED9B}</UniqueIdentifier> + </Filter> + <Filter Include="Resource Files$(MonoPosixHelperFilterSubFolder)"> + <UniqueIdentifier>{C024824E-DFC4-4A50-AA57-AA7F1B4B014E}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files$(MonoPosixHelperFilterSubFolder)"> + <UniqueIdentifier>{E91A4E9A-3F86-4412-BBA5-8C2F3C243845}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj index 8ea0b2ddbb4..9d026fc835b 100644 --- a/msvc/monoposixhelper.vcxproj +++ b/msvc/monoposixhelper.vcxproj @@ -75,10 +75,8 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MonoPosixHelper</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MonoPosixHelper</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MonoPosixHelper</TargetName>
@@ -89,25 +87,17 @@ <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ModuleDefinitionFile>monoposixhelper.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -122,21 +112,14 @@ <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ModuleDefinitionFile>monoposixhelper.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
@@ -146,28 +129,20 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ModuleDefinitionFile>monoposixhelper.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -179,24 +154,17 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>NDEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ModuleDefinitionFile>monoposixhelper.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
@@ -205,59 +173,11 @@ </ProjectReference>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\support\adler32.c" />
- <ClCompile Include="..\support\compress.c" />
- <ClCompile Include="..\support\crc32.c" />
- <ClCompile Include="..\support\deflate.c" />
- <ClCompile Include="..\support\errno.c" />
- <ClCompile Include="..\support\fcntl.c" />
- <ClCompile Include="..\support\infback.c" />
- <ClCompile Include="..\support\inffast.c" />
- <ClCompile Include="..\support\inflate.c" />
- <ClCompile Include="..\support\inftrees.c" />
- <ClCompile Include="..\support\map.c" />
- <ClCompile Include="..\support\minizip\ioapi.c" />
- <ClCompile Include="..\support\minizip\iowin32.c" />
- <ClCompile Include="..\support\minizip\minizip.c" />
- <ClCompile Include="..\support\minizip\unzip.c" />
- <ClCompile Include="..\support\minizip\zip.c" />
- <ClCompile Include="..\support\signal.c" />
- <ClCompile Include="..\support\stdio.c" />
- <ClCompile Include="..\support\stdlib.c" />
- <ClCompile Include="..\support\string.c" />
- <ClCompile Include="..\support\sys-stat.c" />
- <ClCompile Include="..\support\trees.c" />
- <ClCompile Include="..\support\uncompr.c" />
- <ClCompile Include="..\support\zlib-helper.c" />
- <ClCompile Include="..\support\zutil.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\support\inffast.h" />
- <ClInclude Include="..\support\crc32.h" />
- <ClInclude Include="..\support\deflate.h" />
- <ClInclude Include="..\support\inffixed.h" />
- <ClInclude Include="..\support\inflate.h" />
- <ClInclude Include="..\support\inftrees.h" />
- <ClInclude Include="..\support\map.h" />
- <ClInclude Include="..\support\minizip\crypt.h" />
- <ClInclude Include="..\support\minizip\ioapi.h" />
- <ClInclude Include="..\support\minizip\iowin32.h" />
- <ClInclude Include="..\support\minizip\unzip.h" />
- <ClInclude Include="..\support\minizip\zip.h" />
- <ClInclude Include="..\support\mph.h" />
- <ClInclude Include="..\support\trees.h" />
- <ClInclude Include="..\support\zconf.h" />
- <ClInclude Include="..\support\zlib.h" />
- <ClInclude Include="..\support\zutil.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="monoposixhelper.def" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
</ItemGroup>
+ <Import Project="monoposixhelper.targets" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/msvc/monoposixhelper.vcxproj.filters b/msvc/monoposixhelper.vcxproj.filters index 9ca88289700..9d1aeac6764 100644 --- a/msvc/monoposixhelper.vcxproj.filters +++ b/msvc/monoposixhelper.vcxproj.filters @@ -1,135 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <ClCompile Include="..\support\adler32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\compress.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\crc32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\deflate.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\errno.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\infback.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\inffast.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\inflate.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\inftrees.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\map.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\signal.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\stdio.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\stdlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\string.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\trees.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\uncompr.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\zlib-helper.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\zutil.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\minizip\iowin32.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\minizip\minizip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\minizip\unzip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\minizip\zip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\minizip\ioapi.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\fcntl.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\support\sys-stat.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\support\crc32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\deflate.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\inffast.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\inffixed.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\inflate.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\inftrees.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\map.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\mph.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\trees.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\zconf.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\zutil.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\minizip\crypt.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\minizip\unzip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\minizip\iowin32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\minizip\zip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\zlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\support\minizip\ioapi.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
+ <Import Project="monoposixhelper.targets.filters" />
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{45dae598-72bc-4d0e-9cba-004f84c718c0}</UniqueIdentifier>
@@ -141,9 +12,4 @@ <UniqueIdentifier>{2835d7d3-cd1c-4f3c-8783-d2413b0b1ae2}</UniqueIdentifier>
</Filter>
</ItemGroup>
- <ItemGroup>
- <None Include="monoposixhelper.def">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index 5ffd5ac8af5..d491a5bd266 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -98,14 +96,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4018;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -114,23 +107,20 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -138,14 +128,9 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -157,14 +142,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4018;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ProjectReference>
@@ -173,9 +153,7 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,13 +161,13 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -197,28 +175,15 @@ <Link>
<AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\tools\pedump\pedump.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libgc.vcxproj">
- <Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
- </ProjectReference>
- <ProjectReference Include="libgcmonosgen.vcxproj">
- <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-static.vcxproj">
+ <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0772}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index ec2f88f0dac..c16a2c30496 100644 --- a/msvc/profiler-vtune.vcxproj +++ b/msvc/profiler-vtune.vcxproj @@ -77,8 +77,6 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mono-profiler-vtune$(MONO_TARGET_SUFFIX)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mono-profiler-vtune$(MONO_TARGET_SUFFIX)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mono-profiler-vtune$(MONO_TARGET_SUFFIX)</TargetName>
@@ -86,22 +84,15 @@ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -112,21 +103,15 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <StringPooling>true</StringPooling>
</ClCompile>
<Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -141,18 +126,13 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
</Link>
<ProjectReference>
@@ -164,17 +144,13 @@ <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
</Link>
<ProjectReference>
@@ -188,20 +164,11 @@ <None Include="mono-profiler-vtune.def" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libgc.vcxproj">
- <Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>
- </ProjectReference>
- <ProjectReference Include="libgcmonosgen.vcxproj">
- <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/msvc/test-invoke.vcxproj b/msvc/test-invoke.vcxproj index f258fb673c6..b753a04e32f 100644 --- a/msvc/test-invoke.vcxproj +++ b/msvc/test-invoke.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -98,14 +96,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -113,38 +106,30 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
+ <SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -156,14 +141,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -171,9 +151,7 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -181,36 +159,29 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\samples\embed\test-invoke.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/test-metadata.vcxproj b/msvc/test-metadata.vcxproj index 810f82f82fa..6b6c771d3dd 100644 --- a/msvc/test-metadata.vcxproj +++ b/msvc/test-metadata.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -98,14 +96,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -113,37 +106,29 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -156,14 +141,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -171,9 +151,7 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -181,24 +159,20 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -206,11 +180,8 @@ <ClCompile Include="..\samples\embed\test-metadata.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index 826b9b62633..7ee098d0174 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -88,12 +88,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <TreatWarningAsError>false</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -101,9 +98,6 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>false</OptimizeReferences>
- <EnableCOMDATFolding>false</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -111,14 +105,13 @@ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <TreatWarningAsError>false</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -126,7 +119,6 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
@@ -140,12 +132,9 @@ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <TreatWarningAsError>false</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -153,10 +142,6 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <OptimizeReferences>false</OptimizeReferences>
- <EnableCOMDATFolding>false</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -164,14 +149,13 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
- <TreatWarningAsError>false</TreatWarningAsError>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -179,7 +163,6 @@ <Link>
<AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -222,9 +205,6 @@ <ProjectReference Include="eglib.vcxproj">
<Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
</ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/msvc/teste.vcxproj b/msvc/teste.vcxproj index 5fac6d8ac23..12be4cfb64f 100644 --- a/msvc/teste.vcxproj +++ b/msvc/teste.vcxproj @@ -72,13 +72,11 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>
@@ -94,18 +92,13 @@ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
+ <Optimization>Disabled</Optimization>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -113,37 +106,29 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -152,18 +137,13 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
</PrecompiledHeader>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>CompileAsC</CompileAs>
+ <Optimization>Disabled</Optimization>
+ <MinimalRebuild>true</MinimalRebuild>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -171,9 +151,7 @@ <Link>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -181,24 +159,20 @@ <TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>$(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
<AdditionalDependencies>$(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -206,11 +180,8 @@ <ClCompile Include="..\samples\embed\teste.c" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="eglib.vcxproj">
- <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
- </ProjectReference>
- <ProjectReference Include="libmono.vcxproj">
- <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
+ <ProjectReference Include="libmono-dynamic.vcxproj">
+ <Project>{675f4175-ffb1-480d-ad36-f397578844d4}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|