projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge all static runtime libs into libmono-static.
[mono.git]
/
msvc
/
libmono-static.vcxproj
diff --git
a/msvc/libmono-static.vcxproj
b/msvc/libmono-static.vcxproj
index b8ba2add1e26cb63a52cf948d3b12717f7d75910..3554a60c0392658bd6e07aa2c5c040360d0a01cf 100644
(file)
--- a/
msvc/libmono-static.vcxproj
+++ b/
msvc/libmono-static.vcxproj
@@
-48,6
+48,7
@@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
\r
</ClCompile>
\r
<ClCompile Include="..\mono\mini\mini.c" />
\r
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
\r
</ClCompile>
\r
<ClCompile Include="..\mono\mini\mini.c" />
\r
+ <ClCompile Include="..\mono\mini\memory-access.c" />
\r
<ClInclude Include="..\mono\metadata\remoting.h" />
\r
<ClInclude Include="..\mono\mini\ir-emit.h" />
\r
<ClCompile Include="..\mono\mini\method-to-ir.c" />
\r
<ClInclude Include="..\mono\metadata\remoting.h" />
\r
<ClInclude Include="..\mono\mini\ir-emit.h" />
\r
<ClCompile Include="..\mono\mini\method-to-ir.c" />
\r
@@
-97,7
+98,6
@@
<ClCompile Include="..\mono\mini\mini-codegen.c" />
\r
<ClCompile Include="..\mono\mini\mini-cross-helpers.c" />
\r
<ClCompile Include="..\mono\mini\mini-exceptions.c" />
\r
<ClCompile Include="..\mono\mini\mini-codegen.c" />
\r
<ClCompile Include="..\mono\mini\mini-cross-helpers.c" />
\r
<ClCompile Include="..\mono\mini\mini-exceptions.c" />
\r
- <ClCompile Include="..\mono\mini\mini-exceptions-native-unwinder.c" />
\r
<ClCompile Include="..\mono\mini\mini-trampolines.c " />
\r
<ClCompile Include="..\mono\mini\tramp-amd64.c">
\r
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
\r
<ClCompile Include="..\mono\mini\mini-trampolines.c " />
\r
<ClCompile Include="..\mono\mini\tramp-amd64.c">
\r
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
\r
@@
-135,6
+135,10
@@
<ClInclude Include="..\mono\mini\mini-llvm.h" />
\r
<ClInclude Include="..\mono\mini\mini-llvm-cpp.h" />
\r
<ClCompile Include="..\mono\mini\mini-native-types.c" />
\r
<ClInclude Include="..\mono\mini\mini-llvm.h" />
\r
<ClInclude Include="..\mono\mini\mini-llvm-cpp.h" />
\r
<ClCompile Include="..\mono\mini\mini-native-types.c" />
\r
+ <ClCompile Include="..\mono\mini\type-checking.c" />
\r
+ <ClCompile Include="..\mono\mini\lldb.c" />
\r
+ <ClCompile Include="..\mono\mini\interp\interp-stubs.c" />
\r
+ <ClCompile Include="..\mono\mini\mini-profiler.c" />
\r
</ItemGroup>
\r
<PropertyGroup Label="Globals">
\r
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}</ProjectGuid>
\r
</ItemGroup>
\r
<PropertyGroup Label="Globals">
\r
<ProjectGuid>{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}</ProjectGuid>
\r
@@
-224,9
+228,11
@@
<Link>
\r
<SubSystem>Windows</SubSystem>
\r
</Link>
\r
<Link>
\r
<SubSystem>Windows</SubSystem>
\r
</Link>
\r
- <PostBuildEvent>
\r
- <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
\r
- </PostBuildEvent>
\r
+ <PostBuildEvent />
\r
+ <Lib>
\r
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
\r
+ </Lib>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
\r
<PreBuildEvent>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
\r
<PreBuildEvent>
\r
@@
-250,9
+256,11
@@
<Link>
\r
<SubSystem>Windows</SubSystem>
\r
</Link>
\r
<Link>
\r
<SubSystem>Windows</SubSystem>
\r
</Link>
\r
- <PostBuildEvent>
\r
- <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
\r
- </PostBuildEvent>
\r
+ <PostBuildEvent />
\r
+ <Lib>
\r
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
\r
+ </Lib>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
\r
<PreBuildEvent>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
\r
<PreBuildEvent>
\r
@@
-275,9
+283,11
@@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
</Link>
\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
</Link>
\r
- <PostBuildEvent>
\r
- <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
\r
- </PostBuildEvent>
\r
+ <PostBuildEvent />
\r
+ <Lib>
\r
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
\r
+ </Lib>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
\r
<PreBuildEvent>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
\r
<PreBuildEvent>
\r
@@
-300,9
+310,11
@@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
</Link>
\r
<EnableCOMDATFolding>true</EnableCOMDATFolding>
\r
<OptimizeReferences>true</OptimizeReferences>
\r
</Link>
\r
- <PostBuildEvent>
\r
- <Command>.\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q</Command>
\r
- </PostBuildEvent>
\r
+ <PostBuildEvent />
\r
+ <Lib>
\r
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <AdditionalDependencies>eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
\r
+ </Lib>
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
<CustomBuildStep Include="..\mono\mini\mini-x86.h">
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
<CustomBuildStep Include="..\mono\mini\mini-x86.h">
\r
@@
-340,4
+352,4
@@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
<ImportGroup Label="ExtensionTargets">
\r
</ImportGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
<ImportGroup Label="ExtensionTargets">
\r
</ImportGroup>
\r
-</Project>
\ No newline at end of file
+</Project>
\r