fix conflict crap

[mono.git] / msvc05 / libtest.vcproj

diff --git a/msvc05/libtest.vcproj b/msvc05/libtest.vcproj
index ff72ec692c1aa63d2d1f1f556fa16a5a15dd89a0..de09370edb0814d00b229d1f6204d99fd4a27ead 100644 (file)
--- a/msvc05/libtest.vcproj
+++ b/msvc05/libtest.vcproj
@@ -44,7 +44,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_X86;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -125,7 +125,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_AMD64;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -206,7 +206,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_X86;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -288,7 +288,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories=""$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0";"$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib";"$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include";.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_AMD64;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -368,7 +368,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\eglib\src;.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_X86;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -449,7 +449,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\eglib\src;.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_AMD64;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -530,7 +530,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories="..\eglib\src;.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_X86;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -612,7 +612,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories="..\eglib\src;.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
+                               PreprocessorDefinitions="TARGET_AMD64;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r