From e86a1e5af8f61523e62c562a9076e690df37609a Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Sat, 20 Jul 2013 16:47:03 -0500 Subject: [PATCH 1/2] automatic change of Platform Toolset when loading in Visual Studio 2012 v110 http://msdn.microsoft.com/en-us/library/vstudio/ff770576.aspx --- mcs/jay/jay.vcxproj | 2 ++ msvc/eglib.vcxproj | 4 ++++ msvc/genmdesc.vcxproj | 4 ++++ msvc/libgc.vcxproj | 4 ++++ msvc/libmono.vcxproj | 8 ++++++++ msvc/libmonoruntime.vcxproj | 12 ++++++++++-- msvc/libmonoutils.vcxproj | 6 +++++- msvc/libtest.vcxproj | 4 ++++ msvc/mono.vcxproj | 8 ++++++++ msvc/monodiet.vcxproj | 4 ++++ msvc/monodis.vcxproj | 4 ++++ msvc/monograph.vcxproj | 4 ++++ msvc/monoposixhelper.vcxproj | 4 ++++ msvc/pedump.vcxproj | 4 ++++ msvc/profiler-codeanalyst.vcxproj | 4 ++++ msvc/profiler-cov.vcxproj | 4 ++++ msvc/profiler-logging.vcxproj | 4 ++++ msvc/profiler-vtune.vcxproj | 4 ++++ msvc/test-invoke.vcxproj | 4 ++++ msvc/test-metadata.vcxproj | 4 ++++ msvc/test_eglib.vcxproj | 4 ++++ msvc/teste.vcxproj | 4 ++++ 22 files changed, 101 insertions(+), 3 deletions(-) diff --git a/mcs/jay/jay.vcxproj b/mcs/jay/jay.vcxproj index cd9d1099f65e..03ee9cc3b072 100644 --- a/mcs/jay/jay.vcxproj +++ b/mcs/jay/jay.vcxproj @@ -19,10 +19,12 @@ Application MultiByte + v110 Application MultiByte + v110 diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index 38cc49ba75ed..b7edc5e83f14 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -27,18 +27,22 @@ StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index 5ec6d8aa5b97..aa5e37085ac9 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -27,21 +27,25 @@ Application false Unicode + v110 Application false Unicode + v110 Application false Unicode + v110 Application false Unicode + v110 diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 76a7e8202e76..1b2327d75648 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -27,18 +27,22 @@ StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 StaticLibrary Unicode + v110 diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj index 97e870734918..f55db134201d 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono.vcxproj @@ -156,41 +156,49 @@ DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false Unicode + v110 diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj index 3965534b31db..b38cff8d3245 100644 --- a/msvc/libmonoruntime.vcxproj +++ b/msvc/libmonoruntime.vcxproj @@ -1,4 +1,4 @@ - + @@ -218,41 +218,49 @@ StaticLibrary true Unicode + v110 StaticLibrary true Unicode + v110 StaticLibrary true Unicode + v110 StaticLibrary true Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 @@ -449,4 +457,4 @@ - + \ No newline at end of file diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index cf6ee840bf0e..c273ee7c896c 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -133,21 +133,25 @@ StaticLibrary true Unicode + v110 StaticLibrary true Unicode + v110 StaticLibrary false Unicode + v110 StaticLibrary false Unicode + v110 @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/msvc/libtest.vcxproj b/msvc/libtest.vcxproj index 0a4e772f4035..fbe0a89b0325 100644 --- a/msvc/libtest.vcxproj +++ b/msvc/libtest.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index 4db2be0c8079..45be18622095 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -44,34 +44,42 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/monodiet.vcxproj b/msvc/monodiet.vcxproj index b7ec16d205aa..2dd2d2631f83 100644 --- a/msvc/monodiet.vcxproj +++ b/msvc/monodiet.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index 02c88b38e7dc..17ff95c816e9 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index 91caf879cd86..d8e0599e91db 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj index b6420a80652d..edb6ce136eb5 100644 --- a/msvc/monoposixhelper.vcxproj +++ b/msvc/monoposixhelper.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index 2c6e2910d21e..1116f3b89042 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/profiler-codeanalyst.vcxproj b/msvc/profiler-codeanalyst.vcxproj index 1ce7d6bfd657..ee2255af874d 100644 --- a/msvc/profiler-codeanalyst.vcxproj +++ b/msvc/profiler-codeanalyst.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/profiler-cov.vcxproj b/msvc/profiler-cov.vcxproj index f4f68e476abc..d24d2858aa2a 100644 --- a/msvc/profiler-cov.vcxproj +++ b/msvc/profiler-cov.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/profiler-logging.vcxproj b/msvc/profiler-logging.vcxproj index 16e248f8de5c..5038b830f871 100644 --- a/msvc/profiler-logging.vcxproj +++ b/msvc/profiler-logging.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index c67d32777796..60faa3ffd7b8 100644 --- a/msvc/profiler-vtune.vcxproj +++ b/msvc/profiler-vtune.vcxproj @@ -27,18 +27,22 @@ DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 DynamicLibrary Unicode + v110 diff --git a/msvc/test-invoke.vcxproj b/msvc/test-invoke.vcxproj index 475b32b1ae91..161940e62f42 100644 --- a/msvc/test-invoke.vcxproj +++ b/msvc/test-invoke.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/test-metadata.vcxproj b/msvc/test-metadata.vcxproj index f28c1e351a1f..51e48f432a89 100644 --- a/msvc/test-metadata.vcxproj +++ b/msvc/test-metadata.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index a25b55e99813..f87a9c2c9761 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 diff --git a/msvc/teste.vcxproj b/msvc/teste.vcxproj index 4125f7569d93..19a6dcb76d6e 100644 --- a/msvc/teste.vcxproj +++ b/msvc/teste.vcxproj @@ -27,18 +27,22 @@ Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 Application Unicode + v110 From bc49da8fd75af63990fc6ee830444083b2d98cee Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Sat, 20 Jul 2013 17:19:34 -0500 Subject: [PATCH 2/2] fixes ctaggart/mono#2 cpuid() now compiles in VS 2012 --- mono/utils/mono-hwcap-x86.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mono/utils/mono-hwcap-x86.c b/mono/utils/mono-hwcap-x86.c index c071ca46d276..57fff00039e7 100644 --- a/mono/utils/mono-hwcap-x86.c +++ b/mono/utils/mono-hwcap-x86.c @@ -42,6 +42,10 @@ gboolean mono_hwcap_x86_has_sse4a = FALSE; static gboolean cpuid (int id, int *p_eax, int *p_ebx, int *p_ecx, int *p_edx) { +#if defined(_MSC_VER) + int info [4]; +#endif + /* First, make sure we can use cpuid if we're on 32-bit. */ #if defined(TARGET_X86) gboolean have_cpuid = FALSE; @@ -86,7 +90,6 @@ cpuid (int id, int *p_eax, int *p_ebx, int *p_ecx, int *p_edx) /* Now issue the actual cpuid instruction. We can use MSVC's __cpuid on both 32-bit and 64-bit. */ #if defined(_MSC_VER) - int info [4]; __cpuid (info, id); *p_eax = info [0]; *p_ebx = info [1];