X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=msvc%2Ftest_eglib.vcxproj;h=826b9b62633eb7d630f1af39741e32e3714afd49;hb=edbc5c2334e10836479d1cc528c68d4ad5b47440;hp=6388bf3cd2ebcc028915a9f30e06f8f9aaa619e7;hpb=01551beda67cddfd502e26b7df5e3d1c99d7d45d;p=mono.git

diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj
index 6388bf3cd2e..826b9b62633 100644
--- a/msvc/test_eglib.vcxproj
+++ b/msvc/test_eglib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -22,6 +22,7 @@
     <ProjectGuid>{80A0620A-3478-4E1A-AA7C-0D2387B892AB}</ProjectGuid>
     <RootNamespace>test_eglib</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -66,14 +67,14 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\bin\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\bin\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\bin\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\bin\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+    <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)\$(Configuration)\</IntDir>
+    <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)\$(Configuration)\</IntDir>
+    <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)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -84,11 +85,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -112,9 +112,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -138,11 +137,10 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
@@ -167,9 +165,8 @@
     </Midl>
     <ClCompile>
       <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
@@ -186,40 +183,40 @@
     </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">