diff options
-rw-r--r-- | msvc/libgc.vcxproj | 16 | ||||
-rw-r--r-- | msvc/libmono-static.vcxproj | 16 | ||||
-rw-r--r-- | msvc/libmono.vcxproj | 8 | ||||
-rw-r--r-- | msvc/libmonodac.vcxproj | 2 | ||||
-rw-r--r-- | msvc/mono.props | 7 | ||||
-rw-r--r-- | msvc/mono.vcxproj | 8 | ||||
-rw-r--r-- | msvc/monodis.vcxproj | 8 | ||||
-rw-r--r-- | msvc/monograph.vcxproj | 8 | ||||
-rw-r--r-- | msvc/pedump.vcxproj | 42 | ||||
-rw-r--r-- | msvc/pedump.vcxproj.filters | 102 | ||||
-rw-r--r-- | msvc/profiler-vtune.vcxproj | 8 |
11 files changed, 51 insertions, 174 deletions
diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 6999c3536b4..60a246b16b5 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -91,9 +91,7 @@ <WarningLevel>Level1</WarningLevel>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
- <Lib>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- </Lib>
+ <Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -106,9 +104,7 @@ <CompileAs>CompileAsC</CompileAs>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
- <Lib>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- </Lib>
+ <Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -127,9 +123,7 @@ <DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
- <Lib>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- </Lib>
+ <Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -145,9 +139,7 @@ <CompileAs>CompileAsC</CompileAs>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
</ClCompile>
- <Lib>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
- </Lib>
+ <Lib />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\libgc\allchblk.c" />
diff --git a/msvc/libmono-static.vcxproj b/msvc/libmono-static.vcxproj index b23daec2505..3554a60c039 100644 --- a/msvc/libmono-static.vcxproj +++ b/msvc/libmono-static.vcxproj @@ -229,6 +229,10 @@ <SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ </Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
@@ -253,6 +257,10 @@ <SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ </Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -276,6 +284,10 @@ <OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ </Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
@@ -299,6 +311,10 @@ <OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent />
+ <Lib>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuildStep Include="..\mono\mini\mini-x86.h">
diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj index 82eff3379b6..50fe92351f6 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono.vcxproj @@ -120,7 +120,7 @@ <LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -168,7 +168,7 @@ <LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -207,7 +207,7 @@ <LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -251,7 +251,7 @@ <LinkLibraryDependencies>true</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>$(MONO_DEF)</ModuleDefinitionFile>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
diff --git a/msvc/libmonodac.vcxproj b/msvc/libmonodac.vcxproj index b8d2520fd58..02308913f62 100644 --- a/msvc/libmonodac.vcxproj +++ b/msvc/libmonodac.vcxproj @@ -92,6 +92,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
@@ -135,6 +136,7 @@ <ImportLibrary>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
diff --git a/msvc/mono.props b/msvc/mono.props index 5b77ed2c275..22b1d59fec2 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -56,14 +56,14 @@ </PropertyGroup> <PropertyGroup Label="Static-Mono-Libraries"> <MONO_RUNTIME_LIBS>libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;$(GC_LIB)</MONO_RUNTIME_LIBS> - <MONO_STATIC_LIBMONO_LIB>libmono-static$(MONO_TARGET_SUFFIX).lib;$(MONO_RUNTIME_LIBS)</MONO_STATIC_LIBMONO_LIB> + <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> <PropertyGroup Label="Static-libmono-Library" Condition="$(MONO_USE_STATIC_LIBMONO)=='true'"> <MONO_LIBMONO_LIB>$(MONO_STATIC_LIBMONO_LIB)</MONO_LIBMONO_LIB> </PropertyGroup> <PropertyGroup Label="Dynamic-libmono-Library" Condition="$(MONO_USE_STATIC_LIBMONO)!='true'"> - <MONO_LIBMONO_LIB>$(MONO_DYNAMIC_LIBMONO_LIB)</MONO_LIBMONO_LIB> + <MONO_LIBMONO_LIB>eglib.lib;$(MONO_DYNAMIC_LIBMONO_LIB)</MONO_LIBMONO_LIB> </PropertyGroup> <PropertyGroup Label="MonoProfiler"> <VTUNE_INCLUDE_DIR>$(ProgramFiles)/Intel/VTune Amplifier XE 2013/include</VTUNE_INCLUDE_DIR> @@ -103,5 +103,8 @@ <AdditionalDependencies>Mswsock.lib;ws2_32.lib;ole32.lib;oleaut32.lib;psapi.lib;version.lib;advapi32.lib;winmm.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)</AdditionalLibraryDirectories> </Link> + <Lib> + <AdditionalLibraryDirectories>$(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration)</AdditionalLibraryDirectories> + </Lib> </ItemDefinitionGroup> </Project> diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index f277f33258b..59cf0bd1b83 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -107,7 +107,7 @@ </ClCompile>
<ProjectReference />
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -140,7 +140,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -163,7 +163,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -192,7 +192,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index 7f14c93115f..c7afb945a20 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -110,7 +110,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -143,7 +143,7 @@ <DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -167,7 +167,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -198,7 +198,7 @@ <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index ce3658dd42c..db342010c2f 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -110,7 +110,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -143,7 +143,7 @@ <DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -167,7 +167,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -197,7 +197,7 @@ <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>eglib.lib;$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index fded8b5ffe6..5ffd5ac8af5 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -112,7 +112,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -136,7 +136,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -171,7 +171,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -195,7 +195,7 @@ <LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Link>
- <AdditionalDependencies>eglib.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmonoutils.lib;$(GC_LIB);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -205,40 +205,6 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\mono\metadata\appdomain.c" />
- <ClCompile Include="..\mono\metadata\assembly.c" />
- <ClCompile Include="..\mono\metadata\boehm-gc.c" />
- <ClCompile Include="..\mono\metadata\class.c" />
- <ClCompile Include="..\mono\metadata\console-win32.c" />
- <ClCompile Include="..\mono\metadata\domain.c" />
- <ClCompile Include="..\mono\metadata\environment.c" />
- <ClCompile Include="..\mono\metadata\w32file-win32.c" />
- <ClCompile Include="..\mono\metadata\w32file.c" />
- <ClCompile Include="..\mono\metadata\w32error-win32.c" />
- <ClCompile Include="..\mono\metadata\filewatcher.c" />
- <ClCompile Include="..\mono\metadata\gc.c" />
- <ClCompile Include="..\mono\metadata\icall-windows.c" />
- <ClCompile Include="..\mono\metadata\icall.c" />
- <ClCompile Include="..\mono\metadata\image.c" />
- <ClCompile Include="..\mono\metadata\loader.c" />
- <ClCompile Include="..\mono\metadata\locales.c" />
- <ClCompile Include="..\mono\metadata\marshal-windows.c" />
- <ClCompile Include="..\mono\metadata\marshal.c" />
- <ClCompile Include="..\mono\metadata\metadata.c" />
- <ClCompile Include="..\mono\metadata\monitor.c" />
- <ClCompile Include="..\mono\metadata\mono-config.c" />
- <ClCompile Include="..\mono\utils\mono-dl.c" />
- <ClCompile Include="..\mono\metadata\object.c" />
- <ClCompile Include="..\mono\metadata\w32process.c" />
- <ClCompile Include="..\mono\metadata\w32process-win32.c" />
- <ClCompile Include="..\mono\metadata\profiler.c" />
- <ClCompile Include="..\mono\metadata\rand.c" />
- <ClCompile Include="..\mono\metadata\reflection.c" />
- <ClCompile Include="..\mono\metadata\security-manager.c" />
- <ClCompile Include="..\mono\metadata\w32socket.c" />
- <ClCompile Include="..\mono\metadata\string-icalls.c" />
- <ClCompile Include="..\mono\metadata\sysmath.c" />
- <ClCompile Include="..\mono\metadata\threads.c" />
<ClCompile Include="..\tools\pedump\pedump.c" />
</ItemGroup>
<ItemGroup>
diff --git a/msvc/pedump.vcxproj.filters b/msvc/pedump.vcxproj.filters index 5b01ceb1a56..5503d0afa8c 100644 --- a/msvc/pedump.vcxproj.filters +++ b/msvc/pedump.vcxproj.filters @@ -1,111 +1,9 @@ <?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\boehm-gc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\class.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\console-win32.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>
- <ClCompile Include="..\mono\metadata\w32file.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <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\icall.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\image.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\marshal.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\metadata.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\monitor.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\mono-config.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\utils\mono-dl.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\object.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\reflection.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\security-manager.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\threads.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\tools\pedump\pedump.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\mono\metadata\marshal-windows.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\mono\metadata\icall-windows.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>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index 73ace6bdc74..ec2f88f0dac 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_LIBMONO_LIB);$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -128,7 +128,7 @@ <OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<ModuleDefinitionFile>mono-profiler-vtune.def</ModuleDefinitionFile>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ProjectReference>
@@ -148,7 +148,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -171,7 +171,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>$(MONO_LIBMONO_LIB);$(GC_LIB);eglib.lib;jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
|