Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--msvc/.gitignore3
-rw-r--r--msvc/build-all.vcxproj17
-rw-r--r--msvc/build-init.vcxproj17
-rw-r--r--msvc/build-install.vcxproj (renamed from msvc/build-install/build-install.vcxproj)29
-rw-r--r--msvc/build-install.vcxproj.filters (renamed from msvc/build-install/build-install.vcxproj.filters)0
-rw-r--r--msvc/build-package.vcxproj144
-rw-r--r--msvc/build-package.vcxproj.filters2
-rwxr-xr-xmsvc/create-windef.pl2
-rw-r--r--msvc/install.bat43
-rw-r--r--msvc/libmono.vcxproj20
-rw-r--r--msvc/libmonoruntime.vcxproj51
-rw-r--r--msvc/libmonoruntime.vcxproj.filters252
-rw-r--r--msvc/libmonosgen.vcxproj216
-rw-r--r--msvc/libmonosgen.vcxproj.filters171
-rw-r--r--msvc/mono.def1
-rw-r--r--msvc/mono.props6
-rw-r--r--msvc/mono.sln52
-rw-r--r--msvc/monodis.vcxproj14
-rw-r--r--msvc/monosgen.def1
-rw-r--r--msvc/package.bat48
-rw-r--r--msvc/pedump.vcxproj14
-rw-r--r--msvc/profiler-vtune.vcxproj11
22 files changed, 855 insertions, 259 deletions
diff --git a/msvc/.gitignore b/msvc/.gitignore
index 17c9d386c0d..9e32d8ffcb9 100644
--- a/msvc/.gitignore
+++ b/msvc/.gitignore
@@ -8,4 +8,5 @@
/ipch/
/Win32/
/x64/
-/include/ \ No newline at end of file
+/include/
+/package/ \ No newline at end of file
diff --git a/msvc/build-all.vcxproj b/msvc/build-all.vcxproj
index 92165610e2d..515dcc4e5bf 100644
--- a/msvc/build-all.vcxproj
+++ b/msvc/build-all.vcxproj
@@ -68,7 +68,22 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
diff --git a/msvc/build-init.vcxproj b/msvc/build-init.vcxproj
index 525a8060aa4..7f175f07f72 100644
--- a/msvc/build-init.vcxproj
+++ b/msvc/build-init.vcxproj
@@ -68,7 +68,22 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
diff --git a/msvc/build-install/build-install.vcxproj b/msvc/build-install.vcxproj
index ca94d770902..e10c4345ee0 100644
--- a/msvc/build-install/build-install.vcxproj
+++ b/msvc/build-install.vcxproj
@@ -68,13 +68,31 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
</ClCompile>
+ <PostBuildEvent>
+ <Command>.\install.bat $(Platform) $(Configuration) $(MONO_INSTALL_PREFIX)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -82,6 +100,9 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
</ClCompile>
+ <PostBuildEvent>
+ <Command>.\install.bat $(Platform) $(Configuration) $(MONO_INSTALL_PREFIX)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -95,6 +116,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
+ <PostBuildEvent>
+ <Command>.\install.bat $(Platform) $(Configuration) $(MONO_INSTALL_PREFIX)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -108,6 +132,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
+ <PostBuildEvent>
+ <Command>.\install.bat $(Platform) $(Configuration) $(MONO_INSTALL_PREFIX)</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
</ItemGroup>
diff --git a/msvc/build-install/build-install.vcxproj.filters b/msvc/build-install.vcxproj.filters
index ef1ebf58630..ef1ebf58630 100644
--- a/msvc/build-install/build-install.vcxproj.filters
+++ b/msvc/build-install.vcxproj.filters
diff --git a/msvc/build-package.vcxproj b/msvc/build-package.vcxproj
new file mode 100644
index 00000000000..4a7f98dc478
--- /dev/null
+++ b/msvc/build-package.vcxproj
@@ -0,0 +1,144 @@
+<?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="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{B6E563B8-7F57-4F7F-9439-F2405D4E2522}</ProjectGuid>
+ <RootNamespace>buildpackage</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v140</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v140</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v140</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v140</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </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" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>.\package.bat $(Platform) $(Configuration)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>.\package.bat $(Platform) $(Configuration)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <PostBuildEvent>
+ <Command>.\package.bat $(Platform) $(Configuration)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <PostBuildEvent>
+ <Command>.\package.bat $(Platform) $(Configuration)</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/msvc/build-package.vcxproj.filters b/msvc/build-package.vcxproj.filters
new file mode 100644
index 00000000000..ef1ebf58630
--- /dev/null
+++ b/msvc/build-package.vcxproj.filters
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" /> \ No newline at end of file
diff --git a/msvc/create-windef.pl b/msvc/create-windef.pl
index 129314ca64a..e7ad3d3cf9c 100755
--- a/msvc/create-windef.pl
+++ b/msvc/create-windef.pl
@@ -30,7 +30,7 @@ push @symbols, "MonoFixupCorEE";
open (OUT, ">$outfile") || die "Cannot open '$outfile': $!\n";
print OUT "; file generated by create-windef.pl\n";
-print OUT "LIBRARY $dllname\nEXPORTS\n";
+#print OUT "LIBRARY $dllname\nEXPORTS\n";
print OUT join ("\n", @symbols);
print OUT "\n";
diff --git a/msvc/install.bat b/msvc/install.bat
new file mode 100644
index 00000000000..260105ce3a0
--- /dev/null
+++ b/msvc/install.bat
@@ -0,0 +1,43 @@
+@ECHO off
+
+IF "" == "%1" (
+ ECHO Error: No platform parameter set.
+ GOTO ON_ERROR
+
+ )
+IF "" == "%2" (
+ ECHO Error: No configuration parameter set.
+ GOTO ON_ERROR
+)
+
+IF "" == "%3" (
+ ECHO Error: No MONO_INSTALLATION_PREFIX parameter set.
+ GOTO ON_ERROR
+)
+
+IF NOT EXIST %3 (
+ ECHO Error: '%3', directory doesn't eixst.
+ GOTO ON_ERROR
+)
+
+SET PACKAGE_DIR=.\package\%1\%2
+
+IF NOT EXIST %PACKAGE_DIR% (
+ ECHO Error: '%PACKAGE_DIR%' directory unavailable.
+ GOTO ON_ERROR
+)
+
+ECHO Installing mono build %1 %2 into %3 ...
+
+xcopy %PACKAGE_DIR%\*.* %3 /s /e /q /y > nul
+
+ECHO Installing of mono build %1 %2 into %3 DONE.
+
+EXIT /b 0
+
+:ON_ERROR
+ ECHO "install.bat [win32|x64] [Debug|Release] [MONO_INSTALLATION_PREFIX]"
+ EXIT /b 1
+
+@ECHO on
+ \ No newline at end of file
diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj
index 4f921060c85..f6be9fe542f 100644
--- a/msvc/libmono.vcxproj
+++ b/msvc/libmono.vcxproj
@@ -181,6 +181,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}</ProjectGuid>
<RootNamespace>libmono</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -337,9 +338,9 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>mono.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -444,9 +445,9 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>mono.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
@@ -542,9 +543,9 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>mono.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -642,9 +643,9 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoutils.lib;libmonoruntime.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>mono.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<ImportLibrary>$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -736,6 +737,9 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So
<ProjectReference Include="libmonoruntime.vcxproj">
<Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d739}</Project>
</ProjectReference>
+ <ProjectReference Include="libmonosgen.vcxproj">
+ <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
+ </ProjectReference>
<ProjectReference Include="libmonoutils.vcxproj">
<Project>{8fc2b0c8-51ad-49df-851f-5d01a77a75e4}</Project>
</ProjectReference>
diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj
index a90e7e16b5b..d9e27ba4b2c 100644
--- a/msvc/libmonoruntime.vcxproj
+++ b/msvc/libmonoruntime.vcxproj
@@ -95,38 +95,14 @@
<ClCompile Include="..\mono\metadata\sgen-mono.c" />
<ClCompile Include="..\mono\metadata\threadpool-ms-io.c" />
<ClCompile Include="..\mono\metadata\threadpool-ms.c" />
- <ClCompile Include="..\mono\sgen\sgen-alloc.c" />
<ClCompile Include="..\mono\metadata\sgen-bridge.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\metadata\sgen-new-bridge.c" />
- <ClCompile Include="..\mono\sgen\sgen-nursery-allocator.c" />
<ClCompile Include="..\mono\metadata\sgen-old-bridge.c" />
<ClCompile Include="..\mono\metadata\sgen-os-mach.c" />
<ClCompile Include="..\mono\metadata\sgen-os-posix.c" />
<ClCompile Include="..\mono\metadata\sgen-os-win32.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-array-list.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\metadata\sgen-tarjan-bridge.c" />
<ClCompile Include="..\mono\metadata\sgen-toggleref.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\metadata\sgen-stw.c" />
<ClCompile Include="..\mono\metadata\socket-io.c" />
<ClCompile Include="..\mono\metadata\string-icalls.c" />
@@ -159,6 +135,8 @@
<ClInclude Include="..\mono\metadata\number-ms.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\threadpool-ms-io.h" />
<ClInclude Include="..\mono\metadata\threadpool-ms.h" />
<ClInclude Include="..\mono\sgen\gc-internal-agnostic.h" />
@@ -199,25 +177,8 @@
<ClInclude Include="..\mono\metadata\security-core-clr.h" />
<ClInclude Include="..\mono\metadata\security-manager.h" />
<ClInclude Include="..\mono\metadata\security.h" />
- <ClInclude Include="..\mono\sgen\sgen-archdep.h" />
<ClInclude Include="..\mono\metadata\sgen-bridge.h" />
- <ClInclude Include="..\mono\sgen\sgen-cardtable.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-major-copy-object.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-protocol.h" />
- <ClInclude Include="..\mono\sgen\sgen-qsort.h" />
- <ClInclude Include="..\mono\sgen\sgen-scan-object.h" />
<ClInclude Include="..\mono\metadata\sgen-toggleref.h" />
- <ClInclude Include="..\mono\sgen\sgen-thread-pool.h" />
- <ClInclude Include="..\mono\sgen\sgen-workers.h" />
<ClInclude Include="..\mono\metadata\socket-io.h" />
<ClInclude Include="..\mono\metadata\string-icalls.h" />
<ClInclude Include="..\mono\metadata\sysmath.h" />
@@ -364,7 +325,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -395,7 +356,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
@@ -428,7 +389,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@@ -464,7 +425,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
diff --git a/msvc/libmonoruntime.vcxproj.filters b/msvc/libmonoruntime.vcxproj.filters
index 20bbb00c375..401c4f4b411 100644
--- a/msvc/libmonoruntime.vcxproj.filters
+++ b/msvc/libmonoruntime.vcxproj.filters
@@ -1,18 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="..\mono\metadata\appdomain.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<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\boehm-gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\class.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -37,9 +31,6 @@
<ClCompile Include="..\mono\metadata\decimal-ms.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\domain.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\environment.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -55,12 +46,6 @@
<ClCompile Include="..\mono\metadata\filewatcher.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\gc-stats.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\handle.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -100,9 +85,6 @@
<ClCompile Include="..\mono\mini\mini-cross-helpers.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\monitor.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\mono-basic-block.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -118,9 +100,6 @@
<ClCompile Include="..\mono\metadata\mono-endian.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\mono-hash.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\mono-mlist.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -139,9 +118,6 @@
<ClCompile Include="..\mono\metadata\number-ms.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\object.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\opcodes.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -154,9 +130,6 @@
<ClCompile Include="..\mono\metadata\rand.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\reflection.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\mono\metadata\remoting.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -172,125 +145,83 @@
<ClCompile Include="..\mono\metadata\seq-points-data.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-alloc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-bridge.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">
+ <ClCompile Include="..\mono\metadata\socket-io.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-los.c">
+ <ClCompile Include="..\mono\metadata\string-icalls.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-marksweep.c">
+ <ClCompile Include="..\mono\metadata\sysmath.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-memory-governor.c">
+ <ClCompile Include="..\mono\metadata\threadpool-ms.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-mono.c">
+ <ClCompile Include="..\mono\metadata\threadpool-ms-io.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-new-bridge.c">
+ <ClCompile Include="..\mono\metadata\threads.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-nursery-allocator.c">
+ <ClCompile Include="..\mono\metadata\verify.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-old-bridge.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\boehm-gc.c">
+ <Filter>Source Files\boehm</Filter>
</ClCompile>
<ClCompile Include="..\mono\metadata\sgen-os-mach.c">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
<ClCompile Include="..\mono\metadata\sgen-os-posix.c">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
<ClCompile Include="..\mono\metadata\sgen-os-win32.c">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\sgen</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 Include="..\mono\metadata\appdomain.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-simple-nursery.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\domain.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-split-nursery.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\gc-stats.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-stw.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\gc.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\monitor.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-thread-pool.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\mono-hash.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sgen-toggleref.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\object.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\sgen\sgen-workers.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\reflection.c">
+ <Filter>Source Files\gc</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\socket-io.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-bridge.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\string-icalls.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-old-bridge.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\sysmath.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-new-bridge.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\threadpool-ms.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\threadpool-ms-io.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-toggleref.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\threads.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-stw.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\verify.c">
- <Filter>Source Files</Filter>
+ <ClCompile Include="..\mono\metadata\sgen-mono.c">
+ <Filter>Source Files\sgen</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -351,12 +282,6 @@
<ClInclude Include="..\mono\metadata\filewatcher.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\mono\sgen\gc-internal-agnostic.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\gc-internals.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\mono\metadata\handle.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -447,9 +372,6 @@
<ClInclude Include="..\mono\metadata\opcodes.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-descriptor.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\mono\metadata\process.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -483,60 +405,6 @@
<ClInclude Include="..\mono\metadata\seq-points-data.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-archdep.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-bridge.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-cardtable.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-gc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-gray.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-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-protocol.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-thread-pool.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\metadata\sgen-toggleref.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\mono\sgen\sgen-workers.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\mono\metadata\socket-io.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -567,6 +435,24 @@
<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>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
@@ -578,5 +464,23 @@
<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>
</Project> \ No newline at end of file
diff --git a/msvc/libmonosgen.vcxproj b/msvc/libmonosgen.vcxproj
new file mode 100644
index 00000000000..9bfe620af3a
--- /dev/null
+++ b/msvc/libmonosgen.vcxproj
@@ -0,0 +1,216 @@
+<?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>
+ <ClCompile Include="..\mono\sgen\sgen-alloc.c" />
+ <ClCompile Include="..\mono\metadata\sgen-bridge.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-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>
+ <RootNamespace>libmonosgen</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </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)'=='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>
+ <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)'=='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>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <OmitFramePointers>false</OmitFramePointers>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/msvc/libmonosgen.vcxproj.filters b/msvc/libmonosgen.vcxproj.filters
new file mode 100644
index 00000000000..05fd945cdc2
--- /dev/null
+++ b/msvc/libmonosgen.vcxproj.filters
@@ -0,0 +1,171 @@
+<?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\metadata\sgen-bridge.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>
+ </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>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{62eb1a19-26dd-4c17-8bd0-0a734673637d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{0de15c24-0de8-4592-88fc-d16d0ad05d21}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{ede39adb-354b-436b-9fc1-0e7667901ab6}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/msvc/mono.def b/msvc/mono.def
index cec505f17e5..bbc7249634d 100644
--- a/msvc/mono.def
+++ b/msvc/mono.def
@@ -1,5 +1,4 @@
; file generated by create-windef.pl
-LIBRARY mono-2.0.dll
EXPORTS
MonoFixupCorEE
mono_add_internal_call
diff --git a/msvc/mono.props b/msvc/mono.props
index aa37ccd7bac..e3a5203f4ef 100644
--- a/msvc/mono.props
+++ b/msvc/mono.props
@@ -15,6 +15,12 @@
<GLIB_CFLAGS_INCLUDE>$(MONO_EGLIB_SOURCE_DIR)</GLIB_CFLAGS_INCLUDE>
<BOEHM_DEFINES>HAVE_BOEHM_GC</BOEHM_DEFINES>
<SGEN_DEFINES>HAVE_SGEN_GC;HAVE_MOVING_COLLECTOR;HAVE_WRITE_BARRIERS</SGEN_DEFINES>
+ <GC_DEFINES>$(SGEN_DEFINES)</GC_DEFINES>
+ <GC_LIB>libmonosgen.lib</GC_LIB>
+ <MONO_DEF>monosgen.def</MONO_DEF>
+ <!--<GC_DEFINES>$(BOEHM_DEFINES)</GC_DEFINES>-->
+ <!--<GC_LIB>libgc.lib</GC_LIB>-->
+ <!--<MONO_DEF>mono.def</MONO_DEF>-->
<VTUNE_INCLUDE_DIR>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\include</VTUNE_INCLUDE_DIR>
</PropertyGroup>
<ItemGroup />
diff --git a/msvc/mono.sln b/msvc/mono.sln
index 6e49df945e0..a2f9c624404 100644
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -119,7 +119,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-all", "build-all.vcxp
{80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {80A0620A-3478-4E1A-AA7C-0D2387B892AB}
{EB56000B-C80B-4E8B-908D-D84D31B517D3} = {EB56000B-C80B-4E8B-908D-D84D31B517D3}
{5A435710-E6D2-4DD4-9B3F-A7239A32C6F4} = {5A435710-E6D2-4DD4-9B3F-A7239A32C6F4}
- {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
{5D485D32-3B9F-4287-AB24-C8DA5B89F537} = {5D485D32-3B9F-4287-AB24-C8DA5B89F537}
{33014734-0F46-4099-9A21-0C989E428681} = {33014734-0F46-4099-9A21-0C989E428681}
{C5639B3F-288A-4A4B-A4A5-C0D85834221D} = {C5639B3F-288A-4A4B-A4A5-C0D85834221D}
@@ -139,7 +138,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-all", "build-all.vcxp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-init", "build-init.vcxproj", "{92AE7622-5F58-4234-9A26-9EC71876B3F4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-install", "build-install\build-install.vcxproj", "{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-install", "build-install.vcxproj", "{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-package", "build-package.vcxproj", "{B6E563B8-7F57-4F7F-9439-F2405D4E2522}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5362490B-8516-44EE-9987-014C015A080A} = {5362490B-8516-44EE-9987-014C015A080A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmonosgen", "libmonosgen.vcxproj", "{C36612BD-22D3-4B95-85E2-7FDC4FC5D740}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{21DF4C80-0EC9-4BFE-8552-2D47FCEF419A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -454,21 +462,37 @@ Global
{92AE7622-5F58-4234-9A26-9EC71876B3F4}.Release|x64.ActiveCfg = Release|x64
{92AE7622-5F58-4234-9A26-9EC71876B3F4}.Release|x64.Build.0 = Release|x64
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug_SGen|Win32.Build.0 = Debug|Win32
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug_SGen|x64.ActiveCfg = Debug|x64
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug_SGen|x64.Build.0 = Debug|x64
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug|Win32.ActiveCfg = Debug|Win32
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug|Win32.Build.0 = Debug|Win32
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug|x64.ActiveCfg = Debug|x64
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Debug|x64.Build.0 = Debug|x64
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release_SGen|Win32.ActiveCfg = Release|Win32
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release_SGen|Win32.Build.0 = Release|Win32
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release_SGen|x64.ActiveCfg = Release|x64
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release_SGen|x64.Build.0 = Release|x64
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release|Win32.ActiveCfg = Release|Win32
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release|Win32.Build.0 = Release|Win32
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release|x64.ActiveCfg = Release|x64
- {A9DC644B-9171-4FCD-BF21-2CC6D055FC40}.Release|x64.Build.0 = Release|x64
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Debug_SGen|x64.ActiveCfg = Debug|x64
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Debug|x64.ActiveCfg = Debug|x64
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Release_SGen|Win32.ActiveCfg = Release|Win32
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Release_SGen|x64.ActiveCfg = Release|x64
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Release|Win32.ActiveCfg = Release|Win32
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522}.Release|x64.ActiveCfg = Release|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug_SGen|Win32.Build.0 = Debug|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug_SGen|x64.ActiveCfg = Debug|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug_SGen|x64.Build.0 = Debug|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug|Win32.Build.0 = Debug|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug|x64.ActiveCfg = Debug|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Debug|x64.Build.0 = Debug|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release_SGen|Win32.ActiveCfg = Release|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release_SGen|Win32.Build.0 = Release|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release_SGen|x64.ActiveCfg = Release|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release_SGen|x64.Build.0 = Release|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release|Win32.ActiveCfg = Release|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release|Win32.Build.0 = Release|Win32
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release|x64.ActiveCfg = Release|x64
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -479,7 +503,7 @@ Global
{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}
- {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1}
+ {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {21DF4C80-0EC9-4BFE-8552-2D47FCEF419A}
{37F50E5A-4818-46CF-81FE-4BB06DE5D42E} = {EE2CC761-9652-44AC-9204-7EB31194CAA6}
{84C7DB50-D6F8-4C47-B22C-6BB203AEB4D3} = {EE2CC761-9652-44AC-9204-7EB31194CAA6}
{CA2A69D6-3B9D-45A5-8BF7-4E242E683122} = {EE2CC761-9652-44AC-9204-7EB31194CAA6}
@@ -495,11 +519,13 @@ Global
{5362490B-8516-44EE-9987-014C015A080A} = {DC782E23-920A-4873-82A7-37F195FB92C1}
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {DC782E23-920A-4873-82A7-37F195FB92C1}
{A9DC644B-9171-4FCD-BF21-2CC6D055FC40} = {DC782E23-920A-4873-82A7-37F195FB92C1}
+ {B6E563B8-7F57-4F7F-9439-F2405D4E2522} = {DC782E23-920A-4873-82A7-37F195FB92C1}
+ {C36612BD-22D3-4B95-85E2-7FDC4FC5D740} = {21DF4C80-0EC9-4BFE-8552-2D47FCEF419A}
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/monodis.vcxproj b/msvc/monodis.vcxproj
index e80bf6ce031..d2279cf728f 100644
--- a/msvc/monodis.vcxproj
+++ b/msvc/monodis.vcxproj
@@ -99,7 +99,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -134,7 +134,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -160,7 +160,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -193,7 +193,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -218,9 +218,15 @@
<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="libmono.vcxproj">
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
</ProjectReference>
+ <ProjectReference Include="libmonosgen.vcxproj">
+ <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/msvc/monosgen.def b/msvc/monosgen.def
index 246785ccb6b..081051fe5e0 100644
--- a/msvc/monosgen.def
+++ b/msvc/monosgen.def
@@ -1,5 +1,4 @@
; file generated by create-windef.pl
-LIBRARY monosgen-2.0.dll
EXPORTS
MonoFixupCorEE
mono_add_internal_call
diff --git a/msvc/package.bat b/msvc/package.bat
new file mode 100644
index 00000000000..85ae35f0f5d
--- /dev/null
+++ b/msvc/package.bat
@@ -0,0 +1,48 @@
+@ECHO off
+
+IF "" == "%1" (
+ ECHO Error: No platform parameter set.
+ GOTO ON_ERROR
+)
+
+IF "" == "%2" (
+ ECHO Error: No configuration parameter set.
+ GOTO ON_ERROR
+)
+
+IF NOT EXIST .\%1\lib\%2 (
+ ECHO Error: No lib directory available for %1 %2. Any build availalbe for platform, configuration pair?
+ GOTO ON_ERROR
+)
+
+IF NOT EXIST .\%1\bin\%2 (
+ ECHO Error: No bin directory available for %1 %2. Any build availalbe for platform, configuration pair?
+ GOTO ON_ERROR
+)
+
+SET PACKAGE_DIR=.\package\%1\%2
+
+ECHO Packaging mono build %1 %2 into '%PACKAGE_DIR%' ...
+
+IF EXIST %PACKAGE_DIR% rmdir %PACKAGE_DIR% /s /q
+mkdir %PACKAGE_DIR%
+mkdir %PACKAGE_DIR%\include\mono-2.0
+xcopy .\include\*.* %PACKAGE_DIR%\include\mono-2.0\ /s /e /q /y > nul
+
+xcopy .\%1\lib\%2\*.lib %PACKAGE_DIR%\lib\ /s /e /q /y > nul
+xcopy .\%1\lib\%2\*.pdb %PACKAGE_DIR%\lib\ /s /e /q /y > nul
+
+xcopy .\%1\bin\%2\*.exe %PACKAGE_DIR%\bin\ /s /e /q /y > nul
+xcopy .\%1\bin\%2\*.dll %PACKAGE_DIR%\bin\ /s /e /q /y > nul
+xcopy .\%1\bin\%2\*.pdb %PACKAGE_DIR%\bin\ /s /e /q /y > nul
+xcopy .\%1\bin\%2\*.lib %PACKAGE_DIR%\bin\ /s /e /q /y > nul
+
+ECHO Packaging of mono build %1 %2 into '%PACKAGE_DIR%' DONE.
+
+EXIT /b 0
+
+:ON_ERROR
+ ECHO "package.bat [win32|x64] [Debug|Release]"
+ EXIT /b 1
+
+@ECHO on
diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj
index d85da2fe585..c1e8e4b0bf2 100644
--- a/msvc/pedump.vcxproj
+++ b/msvc/pedump.vcxproj
@@ -102,7 +102,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -128,7 +128,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -166,7 +166,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -192,7 +192,7 @@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>eglib.lib;libmonoruntime.lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -237,9 +237,15 @@
<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="libmono.vcxproj">
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
</ProjectReference>
+ <ProjectReference Include="libmonosgen.vcxproj">
+ <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj
index f828cbb0b8a..b3b89fce0e2 100644
--- a/msvc/profiler-vtune.vcxproj
+++ b/msvc/profiler-vtune.vcxproj
@@ -103,7 +103,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
- <AdditionalDependencies>mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mono-2.0.lib;$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -129,7 +129,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
- <AdditionalDependencies>mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mono-2.0.lib;$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -150,7 +150,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mono-2.0.lib;$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -174,7 +174,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>mono-2.0.lib;$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -200,6 +200,9 @@
<ProjectReference Include="libmono.vcxproj">
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
</ProjectReference>
+ <ProjectReference Include="libmonosgen.vcxproj">
+ <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 00:57:09 +0300