X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Ftest_eglib.vcxproj;h=7ee098d0174ac30498dcc2ba35928e20a5ed7d58;hb=52e98abd6e5c6d10ddea91a529f7b1b2336e0696;hp=7a35f283b22cb93699e5a6057aec5d9a1677ea06;hpb=3360c14f656070468dc789743f67ef0401af38e1;p=mono.git

diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj
index 7a35f283b22..7ee098d0174 100644
--- a/msvc/test_eglib.vcxproj
+++ b/msvc/test_eglib.vcxproj
@@ -85,17 +85,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName)-int.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -103,9 +98,6 @@
     <Link>
       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -113,16 +105,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName)-int.pdb</ProgramDataBaseFileName>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -130,7 +119,6 @@
     <Link>
       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
@@ -141,17 +129,12 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName)-int.pdb</ProgramDataBaseFileName>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -159,10 +142,6 @@
     <Link>
       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>false</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -170,16 +149,13 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName)-int.pdb</ProgramDataBaseFileName>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <StringPooling>true</StringPooling>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -187,52 +163,48 @@
     <Link>
       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\eglib\test\array.c" />
-    <ClCompile Include="..\eglib\test\dir.c" />
-    <ClCompile Include="..\eglib\test\driver.c" />
-    <ClCompile Include="..\eglib\test\endian.c" />
-    <ClCompile Include="..\eglib\test\fake.c" />
-    <ClCompile Include="..\eglib\test\file.c" />
+    <ClCompile Include="..\mono\eglib\test\array.c" />
+    <ClCompile Include="..\mono\eglib\test\dir.c" />
+    <ClCompile Include="..\mono\eglib\test\driver.c" />
+    <ClCompile Include="..\mono\eglib\test\endian.c" />
+    <ClCompile Include="..\mono\eglib\test\fake.c" />
+    <ClCompile Include="..\mono\eglib\test\file.c" />
     <ClCompile Include="getopt.c" />
     <ClCompile Include="getopt_long.c" />
-    <ClCompile Include="..\eglib\test\hashtable.c" />
-    <ClCompile Include="..\eglib\test\list.c" />
-    <ClCompile Include="..\eglib\test\markup.c" />
-    <ClCompile Include="..\eglib\test\memory.c" />
-    <ClCompile Include="..\eglib\test\module.c" />
-    <ClCompile Include="..\eglib\test\path.c" />
-    <ClCompile Include="..\eglib\test\pattern.c" />
-    <ClCompile Include="..\eglib\test\ptrarray.c" />
-    <ClCompile Include="..\eglib\test\queue.c" />
-    <ClCompile Include="..\eglib\test\shell.c" />
-    <ClCompile Include="..\eglib\test\sizes.c" />
-    <ClCompile Include="..\eglib\test\slist.c" />
-    <ClCompile Include="..\eglib\test\spawn.c" />
-    <ClCompile Include="..\eglib\test\string-util.c" />
-    <ClCompile Include="..\eglib\test\string.c" />
-    <ClCompile Include="..\eglib\test\test.c" />
-    <ClCompile Include="..\eglib\test\timer.c" />
-    <ClCompile Include="..\eglib\test\unicode.c" />
-    <ClCompile Include="..\eglib\test\utf8.c" />
+    <ClCompile Include="..\mono\eglib\test\hashtable.c" />
+    <ClCompile Include="..\mono\eglib\test\list.c" />
+    <ClCompile Include="..\mono\eglib\test\markup.c" />
+    <ClCompile Include="..\mono\eglib\test\memory.c" />
+    <ClCompile Include="..\mono\eglib\test\module.c" />
+    <ClCompile Include="..\mono\eglib\test\path.c" />
+    <ClCompile Include="..\mono\eglib\test\pattern.c" />
+    <ClCompile Include="..\mono\eglib\test\ptrarray.c" />
+    <ClCompile Include="..\mono\eglib\test\queue.c" />
+    <ClCompile Include="..\mono\eglib\test\shell.c" />
+    <ClCompile Include="..\mono\eglib\test\sizes.c" />
+    <ClCompile Include="..\mono\eglib\test\slist.c" />
+    <ClCompile Include="..\mono\eglib\test\spawn.c" />
+    <ClCompile Include="..\mono\eglib\test\string-util.c" />
+    <ClCompile Include="..\mono\eglib\test\string.c" />
+    <ClCompile Include="..\mono\eglib\test\test.c" />
+    <ClCompile Include="..\mono\eglib\test\timer.c" />
+    <ClCompile Include="..\mono\eglib\test\unicode.c" />
+    <ClCompile Include="..\mono\eglib\test\utf8.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="getopt.h" />
     <ClInclude Include="getopt_long.h" />
-    <ClInclude Include="..\eglib\src\glib.h" />
-    <ClInclude Include="..\eglib\test\test.h" />
-    <ClInclude Include="..\eglib\test\tests.h" />
+    <ClInclude Include="..\mono\eglib\src\glib.h" />
+    <ClInclude Include="..\mono\eglib\test\test.h" />
+    <ClInclude Include="..\mono\eglib\test\tests.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="eglib.vcxproj">
       <Project>{158073ed-99ae-4196-9edc-ddb2344f8466}</Project>
     </ProjectReference>
-    <ProjectReference Include="libmono.vcxproj">
-      <Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">