X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Flibmonoutils.vcxproj;h=fd727132bc650fcb5ef9b7e2ed56fd66bf1a7903;hb=56247cecbdce6dc3a14228541bbb7515634f099b;hp=88101452d9d41e744a3f611108187af9c947a33a;hpb=01551beda67cddfd502e26b7df5e3d1c99d7d45d;p=mono.git

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index 88101452d9d..fd727132bc6 100644
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -18,144 +18,6 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\mono\utils\dlmalloc.c" />
-    <ClCompile Include="..\mono\utils\hazard-pointer.c" />
-    <ClCompile Include="..\mono\utils\json.c" />
-    <ClCompile Include="..\mono\utils\lock-free-alloc.c" />
-    <ClCompile Include="..\mono\utils\lock-free-array-queue.c" />
-    <ClCompile Include="..\mono\utils\lock-free-queue.c" />
-    <ClCompile Include="..\mono\utils\mach-support-amd64.c" />
-    <ClCompile Include="..\mono\utils\mach-support-arm.c" />
-    <ClCompile Include="..\mono\utils\mach-support-x86.c" />
-    <ClCompile Include="..\mono\utils\mach-support.c" />
-    <ClCompile Include="..\mono\utils\mono-codeman.c" />
-    <ClCompile Include="..\mono\utils\mono-conc-hashtable.c" />
-    <ClCompile Include="..\mono\utils\mono-context.c" />
-    <ClCompile Include="..\mono\utils\mono-counters.c" />
-    <ClCompile Include="..\mono\utils\mono-dl-windows.c" />
-    <ClCompile Include="..\mono\utils\mono-dl.c" />
-    <ClCompile Include="..\mono\utils\mono-error.c" />
-    <ClCompile Include="..\mono\utils\mono-filemap.c" />
-    <ClCompile Include="..\mono\utils\mono-internal-hash.c" />
-    <ClCompile Include="..\mono\utils\mono-io-portability.c" />
-    <ClCompile Include="..\mono\utils\mono-linked-list-set.c" />
-    <ClCompile Include="..\mono\utils\mono-logger.c" />
-    <ClCompile Include="..\mono\utils\mono-math.c" />
-    <ClCompile Include="..\mono\utils\mono-md5.c" />
-    <ClCompile Include="..\mono\utils\mono-mmap.c" />
-    <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />
-    <ClCompile Include="..\mono\utils\mono-rand.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />
-    <ClCompile Include="..\mono\utils\networking.c" />
-    <ClCompile Include="..\mono\utils\networking-posix.c" />
-    <ClCompile Include="..\mono\utils\networking-missing.c" />
-    <ClCompile Include="..\mono\utils\networking-windows.c" />
-    <ClCompile Include="..\mono\utils\mono-path.c" />
-    <ClCompile Include="..\mono\utils\mono-poll.c" />
-    <ClCompile Include="..\mono\utils\mono-proclib.c" />
-    <ClCompile Include="..\mono\utils\mono-property-hash.c" />
-    <ClCompile Include="..\mono\utils\mono-publib.c" />
-    <ClCompile Include="..\mono\utils\mono-sha1.c" />
-    <ClCompile Include="..\mono\utils\mono-stdlib.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-mach.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-posix.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-windows.c" />
-    <ClCompile Include="..\mono\utils\mono-threads.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-coop.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-posix-abort-syscall.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-mach-abort-syscall.c" />
-    <ClCompile Include="..\mono\utils\mono-threads-windows-abort-syscall.c" />
-    <ClCompile Include="..\mono\utils\mono-time.c" />
-    <ClCompile Include="..\mono\utils\mono-tls.c" />
-    <ClCompile Include="..\mono\utils\mono-uri.c" />
-    <ClCompile Include="..\mono\utils\mono-value-hash.c" />
-    <ClCompile Include="..\mono\utils\monobitset.c" />
-    <ClCompile Include="..\mono\utils\strenc.c" />
-    <ClCompile Include="..\mono\utils\atomic.c" />
-    <ClCompile Include="..\mono\utils\mono-hwcap.c" />
-    <ClCompile Include="..\mono\utils\mono-hwcap-x86.c" />
-    <ClCompile Include="..\mono\utils\bsearch.c" />
-    <ClCompile Include="..\mono\utils\memfuncs.c" />
-    <ClCompile Include="..\mono\utils\parse.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\mono\utils\dlmalloc.h" />
-    <ClInclude Include="..\mono\utils\dtrace.h" />
-    <ClInclude Include="..\mono\utils\freebsd-dwarf.h" />
-    <ClInclude Include="..\mono\utils\freebsd-elf32.h" />
-    <ClInclude Include="..\mono\utils\freebsd-elf64.h" />
-    <ClInclude Include="..\mono\utils\freebsd-elf_common.h" />
-    <ClInclude Include="..\mono\utils\gc_wrapper.h" />
-    <ClInclude Include="..\mono\utils\hazard-pointer.h" />
-    <ClInclude Include="..\mono\utils\json.h" />
-    <ClInclude Include="..\mono\utils\linux_magic.h" />
-    <ClInclude Include="..\mono\utils\lock-free-alloc.h" />
-    <ClInclude Include="..\mono\utils\lock-free-array-queue.h" />
-    <ClInclude Include="..\mono\utils\lock-free-queue.h" />
-    <ClInclude Include="..\mono\utils\mach-support.h" />
-    <ClInclude Include="..\mono\utils\memcheck.h" />
-    <ClInclude Include="..\mono\utils\mono-codeman.h" />
-    <ClInclude Include="..\mono\utils\mono-compiler.h" />
-    <ClInclude Include="..\mono\utils\mono-complex.h" />
-    <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />
-    <ClInclude Include="..\mono\utils\mono-context.h" />
-    <ClInclude Include="..\mono\utils\mono-coop-mutex.h" />
-    <ClInclude Include="..\mono\utils\mono-coop-semaphore.h" />
-    <ClInclude Include="..\mono\utils\mono-counters.h" />
-    <ClInclude Include="..\mono\utils\mono-digest.h" />
-    <ClInclude Include="..\mono\utils\mono-dl-fallback.h" />
-    <ClInclude Include="..\mono\utils\mono-dl.h" />
-    <ClInclude Include="..\mono\utils\mono-error-internals.h" />
-    <ClInclude Include="..\mono\utils\mono-error.h" />
-    <ClInclude Include="..\mono\utils\mono-internal-hash.h" />
-    <ClInclude Include="..\mono\utils\mono-io-portability.h" />
-    <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />
-    <ClInclude Include="..\mono\utils\mono-logger-internals.h" />
-    <ClInclude Include="..\mono\utils\mono-logger.h" />
-    <ClInclude Include="..\mono\utils\mono-machine.h" />
-    <ClInclude Include="..\mono\utils\mono-math.h" />
-    <ClInclude Include="..\mono\utils\mono-membar.h" />
-    <ClInclude Include="..\mono\utils\mono-memory-model.h" />
-    <ClInclude Include="..\mono\utils\mono-mmap.h" />
-    <ClInclude Include="..\mono\utils\mono-networkinterfaces.h" />
-    <ClInclude Include="..\mono\utils\mono-once.h" />
-    <ClInclude Include="..\mono\utils\mono-os-mutex.h" />
-    <ClInclude Include="..\mono\utils\mono-os-semaphore.h" />
-    <ClInclude Include="..\mono\utils\mono-path.h" />
-    <ClInclude Include="..\mono\utils\mono-poll.h" />
-    <ClInclude Include="..\mono\utils\mono-proclib.h" />
-    <ClInclude Include="..\mono\utils\mono-property-hash.h" />
-    <ClInclude Include="..\mono\utils\mono-publib.h" />
-    <ClInclude Include="..\mono\utils\mono-rand.h" />
-    <ClInclude Include="..\mono\utils\mono-sigcontext.h" />
-    <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />
-    <ClInclude Include="..\mono\utils\mono-stdlib.h" />
-    <ClInclude Include="..\mono\utils\mono-string.h" />
-    <ClInclude Include="..\mono\utils\mono-threads.h" />
-    <ClInclude Include="..\mono\utils\mono-threads-api.h" />
-    <ClInclude Include="..\mono\utils\mono-threads-coop.h" />
-    <ClInclude Include="..\mono\utils\mono-threads-posix-signals.h" />
-    <ClInclude Include="..\mono\utils\mono-time.h" />
-    <ClInclude Include="..\mono\utils\mono-tls.h" />
-    <ClInclude Include="..\mono\utils\mono-uri.h" />
-    <ClInclude Include="..\mono\utils\mono-value-hash.h" />
-    <ClInclude Include="..\mono\utils\monobitset.h" />
-    <ClInclude Include="..\mono\utils\strenc.h" />
-    <ClInclude Include="..\mono\utils\valgrind.h" />
-    <ClInclude Include="..\mono\utils\atomic.h" />
-    <ClInclude Include="..\mono\utils\mono-hwcap.h" />
-    <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
-    <ClInclude Include="..\mono\utils\bsearch.h" />
-    <ClInclude Include="..\mono\utils\memfuncs.h" />
-    <ClInclude Include="..\mono\utils\parse.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\mono\utils\win64.asm">
-      <FileType>Document</FileType>
-    </MASM>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="eglib.vcxproj">
       <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
@@ -165,6 +27,7 @@
     <ProjectGuid>{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libmonoutils</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -192,9 +55,6 @@
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project=".\masm.fixed.props" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="mono.props" />
@@ -213,20 +73,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -234,8 +94,9 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -253,8 +114,9 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -265,20 +127,17 @@
       <Command>
       </Command>
     </PreBuildEvent>
-    <MASM>
-      <PreprocessorDefinitions>X64</PreprocessorDefinitions>
-    </MASM>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -296,11 +155,11 @@
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -312,12 +171,7 @@
       <Command>
       </Command>
     </PreBuildEvent>
-    <MASM>
-      <PreprocessorDefinitions>X64</PreprocessorDefinitions>
-    </MASM>
   </ItemDefinitionGroup>
+  <Import Project="libmonoutils.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
 </Project>
\ No newline at end of file