Restructure of mono.sln and build properties to better fix static/dynamic library support.

1 files changed, 6 insertions, 41 deletions

diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj
index 5ffd5ac8af5..d491a5bd266 100644
--- a/msvc/pedump.vcxproj
+++ b/msvc/pedump.vcxproj
@@ -72,13 +72,11 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <TargetName>$(ProjectName)$(MONO_TARGET_SUFFIX)</TargetName>

@@ -98,14 +96,9 @@
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <PrecompiledHeader>

       </PrecompiledHeader>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4018;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ProjectReference>

@@ -114,23 +107,20 @@
     <Link>

       <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

-      <Optimization>MinSpace</Optimization>

       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <StringPooling>true</StringPooling>

     </ClCompile>

     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

@@ -138,14 +128,9 @@
     <Link>

       <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -157,14 +142,9 @@
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <PrecompiledHeader>

       </PrecompiledHeader>

-      <ObjectFileName>$(IntDir)</ObjectFileName>

-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

       <DisableSpecificWarnings>4018;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ProjectReference>

@@ -173,9 +153,7 @@
     <Link>

       <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -183,13 +161,13 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <Optimization>MinSpace</Optimization>

       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <StringPooling>true</StringPooling>

     </ClCompile>

     <ProjectReference>

       <LinkLibraryDependencies>false</LinkLibraryDependencies>

@@ -197,28 +175,15 @@
     <Link>

       <AdditionalDependencies>$(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <TargetMachine>MachineX64</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\tools\pedump\pedump.c" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="eglib.vcxproj">

-      <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libgc.vcxproj">

-      <Project>{eb56000b-c80b-4e8b-908d-d84d31b517d3}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libgcmonosgen.vcxproj">

-      <Project>{c36612bd-22d3-4b95-85e2-7fdc4fc5d740}</Project>

-    </ProjectReference>

-    <ProjectReference Include="libmono.vcxproj">

-      <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>

+    <ProjectReference Include="libmono-static.vcxproj">

+      <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0772}</Project>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />