projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Restructure of mono.sln and build properties to better fix static/dynamic library...
[mono.git] / msvc / libmonoutils.vcxproj
diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index beba4278b8e64cf515143a124e9b3f5b39c13b94..fd727132bc650fcb5ef9b7e2ed56fd66bf1a7903 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -18,201 +18,11 @@
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\mono\utils\dlmalloc.c" />\r
-    <ClCompile Include="..\mono\utils\hazard-pointer.c" />\r
-    <ClCompile Include="..\mono\utils\json.c" />\r
-    <ClCompile Include="..\mono\utils\lock-free-alloc.c" />\r
-    <ClCompile Include="..\mono\utils\lock-free-array-queue.c" />\r
-    <ClCompile Include="..\mono\utils\lock-free-queue.c" />\r
-    <ClCompile Include="..\mono\utils\mach-support-amd64.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mach-support-arm.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mach-support-x86.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mach-support.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-codeman.c" />\r
-    <ClCompile Include="..\mono\utils\mono-conc-hashtable.c" />\r
-    <ClCompile Include="..\mono\utils\mono-context.c" />\r
-    <ClCompile Include="..\mono\utils\mono-counters.c" />\r
-    <ClCompile Include="..\mono\utils\mono-dl-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-dl.c" />\r
-    <ClCompile Include="..\mono\utils\mono-error.c" />\r
-    <ClCompile Include="..\mono\utils\mono-filemap.c" />\r
-    <ClCompile Include="..\mono\utils\mono-internal-hash.c" />\r
-    <ClCompile Include="..\mono\utils\mono-io-portability.c" />\r
-    <ClCompile Include="..\mono\utils\mono-linked-list-set.c" />\r
-    <ClCompile Include="..\mono\utils\mono-logger.c" />\r
-    <ClCompile Include="..\mono\utils\mono-log-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-log-common.c" />\r
-    <ClCompile Include="..\mono\utils\mono-math.c" />\r
-    <ClCompile Include="..\mono\utils\mono-md5.c" />\r
-    <ClCompile Include="..\mono\utils\mono-mmap-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-mmap.c" />\r
-    <ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />\r
-    <ClCompile Include="..\mono\utils\mono-os-wait-win32.c" />\r
-    <ClCompile Include="..\mono\utils\mono-proclib-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-rand-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-rand.c" />\r
-    <ClCompile Include="..\mono\utils\mono-threads-state-machine.c" />\r
-    <ClCompile Include="..\mono\utils\networking.c" />\r
-    <ClCompile Include="..\mono\utils\networking-posix.c" />\r
-    <ClCompile Include="..\mono\utils\networking-missing.c" />\r
-    <ClCompile Include="..\mono\utils\networking-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-path.c" />\r
-    <ClCompile Include="..\mono\utils\mono-poll.c" />\r
-    <ClCompile Include="..\mono\utils\mono-proclib.c" />\r
-    <ClCompile Include="..\mono\utils\mono-property-hash.c" />\r
-    <ClCompile Include="..\mono\utils\mono-publib.c" />\r
-    <ClCompile Include="..\mono\utils\mono-sha1.c" />\r
-    <ClCompile Include="..\mono\utils\mono-stdlib.c" />\r
-    <ClCompile Include="..\mono\utils\mono-threads-mach.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-posix.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c">\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
-    </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-windows.c" />\r
-    <ClCompile Include="..\mono\utils\mono-threads.c" />\r
-    <ClCompile Include="..\mono\utils\mono-threads-coop.c" />\r
-    <ClCompile Include="..\mono\utils\mono-time.c" />\r
-    <ClCompile Include="..\mono\utils\mono-tls.c" />\r
-    <ClCompile Include="..\mono\utils\mono-uri.c" />\r
-    <ClCompile Include="..\mono\utils\mono-value-hash.c" />\r
-    <ClCompile Include="..\mono\utils\monobitset.c" />\r
-    <ClCompile Include="..\mono\utils\mono-os-mutex.c" />\r
-    <ClCompile Include="..\mono\utils\os-event-win32.c" />\r
-    <ClCompile Include="..\mono\utils\strenc.c" />\r
-    <ClCompile Include="..\mono\utils\atomic.c" />\r
-    <ClCompile Include="..\mono\utils\mono-hwcap.c" />\r
-    <ClCompile Include="..\mono\utils\mono-hwcap-x86.c" />\r
-    <ClCompile Include="..\mono\utils\bsearch.c" />\r
-    <ClCompile Include="..\mono\utils\memfuncs.c" />\r
-    <ClCompile Include="..\mono\utils\parse.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\mono\utils\dlmalloc.h" />\r
-    <ClInclude Include="..\mono\utils\dtrace.h" />\r
-    <ClInclude Include="..\mono\utils\freebsd-dwarf.h" />\r
-    <ClInclude Include="..\mono\utils\freebsd-elf32.h" />\r
-    <ClInclude Include="..\mono\utils\freebsd-elf64.h" />\r
-    <ClInclude Include="..\mono\utils\freebsd-elf_common.h" />\r
-    <ClInclude Include="..\mono\utils\gc_wrapper.h" />\r
-    <ClInclude Include="..\mono\utils\hazard-pointer.h" />\r
-    <ClInclude Include="..\mono\utils\json.h" />\r
-    <ClInclude Include="..\mono\utils\linux_magic.h" />\r
-    <ClInclude Include="..\mono\utils\lock-free-alloc.h" />\r
-    <ClInclude Include="..\mono\utils\lock-free-array-queue.h" />\r
-    <ClInclude Include="..\mono\utils\lock-free-queue.h" />\r
-    <ClInclude Include="..\mono\utils\mach-support.h" />\r
-    <ClInclude Include="..\mono\utils\memcheck.h" />\r
-    <ClInclude Include="..\mono\utils\mono-codeman.h" />\r
-    <ClInclude Include="..\mono\utils\mono-compiler.h" />\r
-    <ClInclude Include="..\mono\utils\mono-complex.h" />\r
-    <ClInclude Include="..\mono\utils\mono-conc-hashtable.h" />\r
-    <ClInclude Include="..\mono\utils\mono-context.h" />\r
-    <ClInclude Include="..\mono\utils\mono-coop-mutex.h" />\r
-    <ClInclude Include="..\mono\utils\mono-coop-semaphore.h" />\r
-    <ClInclude Include="..\mono\utils\mono-counters.h" />\r
-    <ClInclude Include="..\mono\utils\mono-digest.h" />\r
-    <ClInclude Include="..\mono\utils\mono-dl-fallback.h" />\r
-    <ClInclude Include="..\mono\utils\mono-dl-windows-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-dl.h" />\r
-    <ClInclude Include="..\mono\utils\mono-error-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-error.h" />\r
-    <ClInclude Include="..\mono\utils\mono-internal-hash.h" />\r
-    <ClInclude Include="..\mono\utils\mono-io-portability.h" />\r
-    <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />\r
-    <ClInclude Include="..\mono\utils\mono-logger-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-logger.h" />\r
-    <ClInclude Include="..\mono\utils\mono-machine.h" />\r
-    <ClInclude Include="..\mono\utils\mono-math.h" />\r
-    <ClInclude Include="..\mono\utils\mono-membar.h" />\r
-    <ClInclude Include="..\mono\utils\mono-memory-model.h" />\r
-    <ClInclude Include="..\mono\utils\mono-mmap-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-mmap-windows-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-mmap.h" />\r
-    <ClInclude Include="..\mono\utils\mono-networkinterfaces.h" />\r
-    <ClInclude Include="..\mono\utils\mono-once.h" />\r
-    <ClInclude Include="..\mono\utils\mono-os-mutex.h" />\r
-    <ClInclude Include="..\mono\utils\mono-os-semaphore.h" />\r
-    <ClInclude Include="..\mono\utils\mono-os-wait.h" />\r
-    <ClInclude Include="..\mono\utils\mono-path.h" />\r
-    <ClInclude Include="..\mono\utils\mono-poll.h" />\r
-    <ClInclude Include="..\mono\utils\mono-proclib-windows-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-proclib.h" />\r
-    <ClInclude Include="..\mono\utils\mono-property-hash.h" />\r
-    <ClInclude Include="..\mono\utils\mono-publib.h" />\r
-    <ClInclude Include="..\mono\utils\mono-rand-windows-internals.h" />\r
-    <ClInclude Include="..\mono\utils\mono-rand.h" />\r
-    <ClInclude Include="..\mono\utils\mono-sigcontext.h" />\r
-    <ClInclude Include="..\mono\utils\mono-stack-unwinding.h" />\r
-    <ClInclude Include="..\mono\utils\mono-stdlib.h" />\r
-    <ClInclude Include="..\mono\utils\mono-string.h" />\r
-    <ClInclude Include="..\mono\utils\mono-threads.h" />\r
-    <ClInclude Include="..\mono\utils\mono-threads-api.h" />\r
-    <ClInclude Include="..\mono\utils\mono-threads-coop.h" />\r
-    <ClInclude Include="..\mono\utils\mono-time.h" />\r
-    <ClInclude Include="..\mono\utils\mono-tls.h" />\r
-    <ClInclude Include="..\mono\utils\mono-uri.h" />\r
-    <ClInclude Include="..\mono\utils\mono-value-hash.h" />\r
-    <ClInclude Include="..\mono\utils\monobitset.h" />\r
-    <ClInclude Include="..\mono\utils\os-event.h" />\r
-    <ClInclude Include="..\mono\utils\strenc.h" />\r
-    <ClInclude Include="..\mono\utils\valgrind.h" />\r
-    <ClInclude Include="..\mono\utils\atomic.h" />\r
-    <ClInclude Include="..\mono\utils\unlocked.h" />\r
-    <ClInclude Include="..\mono\utils\mono-hwcap.h" />\r
-    <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />\r
-    <ClInclude Include="..\mono\utils\bsearch.h" />\r
-    <ClInclude Include="..\mono\utils\memfuncs.h" />\r
-    <ClInclude Include="..\mono\utils\parse.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <MASM Include="..\mono\utils\win64.asm">\r
-      <FileType>Document</FileType>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-    </MASM>\r
-  </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="eglib.vcxproj">\r
       <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>\r
     </ProjectReference>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="..\mono\utils\Makefile.am" />\r
-  </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
@@ -245,9 +55,6 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-    <Import Project=".\masm.fixed.props" />\r
-  </ImportGroup>\r
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="mono.props" />\r
@@ -289,8 +96,8 @@
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -307,10 +114,10 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -320,21 +127,17 @@
       <Command>\r
       </Command>\r
     </PreBuildEvent>\r
-    <MASM>\r
-      <PreprocessorDefinitions>X64</PreprocessorDefinitions>\r
-    </MASM>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <StringPooling>true</StringPooling>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -352,12 +155,11 @@
       <WarningLevel>Level3</WarningLevel>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <StringPooling>true</StringPooling>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -369,12 +171,7 @@
       <Command>\r
       </Command>\r
     </PreBuildEvent>\r
-    <MASM>\r
-      <PreprocessorDefinitions>X64</PreprocessorDefinitions>\r
-    </MASM>\r
   </ItemDefinitionGroup>\r
+  <Import Project="libmonoutils.targets" />\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />\r
-  </ImportGroup>\r
 </Project>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono