From 8938bfd2324848684c9dd7660bb4699ed9412173 Mon Sep 17 00:00:00 2001 From: lateralusX Date: Tue, 12 Apr 2016 14:10:35 +0200 Subject: Upgrade to vs2015 for native projects. * Upgraded all projects to new vs2015 tool chain. * Used mono.props through property manager instead of import. * Fixed dependencies to be more explicitly in additional dependecies. * Fixed error in mono.props, switched $ to % when referencing internal variables. * Added property variables for includes and libraries, defined in mono.props. --- msvc/eglib.vcxproj | 24 +++++---- msvc/genmdesc.vcxproj | 57 ++++++++++---------- msvc/libgc.vcxproj | 23 ++++---- msvc/libmono.vcxproj | 121 +++++++++++++++++++------------------------ msvc/libmonoruntime.vcxproj | 49 +++++++++++------- msvc/libmonoutils.vcxproj | 27 ++++++---- msvc/libtest.vcxproj | 51 ++++++++---------- msvc/mono.props | 28 +++++++--- msvc/mono.vcxproj | 117 ++++++++++++++++++++++------------------- msvc/monodis.vcxproj | 68 +++++++++++------------- msvc/monograph.vcxproj | 60 +++++++++------------ msvc/monoposixhelper.vcxproj | 57 ++++++++++++-------- msvc/pedump.vcxproj | 86 +++++++++--------------------- msvc/profiler-vtune.vcxproj | 48 +++++++++++------ msvc/test-invoke.vcxproj | 42 +++++++-------- msvc/test-metadata.vcxproj | 50 ++++++++---------- msvc/test_eglib.vcxproj | 56 ++++++++++---------- msvc/teste.vcxproj | 42 +++++++-------- 18 files changed, 496 insertions(+), 510 deletions(-) (limited to 'msvc') diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index b3d0229f79d..ce65a8a24fb 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -43,7 +43,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -53,7 +53,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -63,7 +63,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -73,7 +73,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -85,24 +85,28 @@ + + + + @@ -133,14 +137,14 @@ Disabled - ../eglib/src;../eglib;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL Level4 - EditAndContinue + ProgramDatabase @@ -165,7 +169,7 @@ MinSpace - ../eglib/src;../eglib;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) MultiThreadedDLL @@ -196,7 +200,7 @@ Disabled - ../eglib/src;../eglib;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -234,7 +238,7 @@ MinSpace - ../eglib/src;../eglib;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) MultiThreadedDLL diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index 001463f7af2..5ee39c5564c 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -34,7 +34,6 @@ x64 - {B7098DFA-31E6-4006-8A15-1C9A4E925149} genmdesc @@ -44,7 +43,7 @@ Application false Unicode - v120 + v140 Application @@ -56,7 +55,7 @@ Application false Unicode - v120 + v140 Application @@ -68,7 +67,7 @@ Application false Unicode - v120 + v140 Application @@ -80,7 +79,7 @@ Application false Unicode - v120 + v140 Application @@ -93,24 +92,28 @@ + + + + @@ -135,6 +138,12 @@ $(Platform)\bin\ $(Platform)\obj\$(ProjectName)\ + + true + + + true + @@ -147,7 +156,7 @@ Disabled - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -156,7 +165,7 @@ Level3 true - EditAndContinue + ProgramDatabase CompileAsC @@ -167,9 +176,9 @@ false - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) true - $(Platform)\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console MachineX86 @@ -234,7 +243,7 @@ Disabled - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) _DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks @@ -254,9 +263,9 @@ false - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) true - $(Platform)\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -322,7 +331,7 @@ MinSpace OnlyExplicitInline - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -340,9 +349,9 @@ false - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) true - $(Platform)\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) Console MachineX86 true @@ -407,7 +416,7 @@ MinSpace OnlyExplicitInline - ..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -426,9 +435,9 @@ false - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) true - $(Platform)\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) Console MachineX64 true @@ -635,16 +644,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - true - false - true - false - - diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 2be0904f02f..674dcb322ae 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -43,7 +43,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -53,7 +53,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -63,7 +63,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -73,7 +73,7 @@ StaticLibrary Unicode - v120 + v140 StaticLibrary @@ -85,24 +85,28 @@ + + + + @@ -130,7 +134,7 @@ Disabled - ..\libgc\include;%(AdditionalIncludeDirectories) + $(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories) _DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks @@ -142,6 +146,7 @@ ProgramDatabase CompileAsC 4311;4312;4996;4005;%(DisableSpecificWarnings) + Level1 $(OutDir)libgc.lib @@ -170,7 +175,7 @@ MinSpace - ..\libgc\include;%(AdditionalIncludeDirectories) + $(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories) NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -207,7 +212,7 @@ Disabled - ..\libgc\include;%(AdditionalIncludeDirectories) + $(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories) _DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024 true EnableFastChecks @@ -253,7 +258,7 @@ MinSpace - ..\libgc\include;%(AdditionalIncludeDirectories) + $(MONO_LIBGC_INCLUDE_DIR);%(AdditionalIncludeDirectories) NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj index 68a0ff55687..122506a9e7f 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono.vcxproj @@ -1,5 +1,5 @@  - + Debug_SGen @@ -34,7 +34,6 @@ x64 - @@ -188,76 +187,84 @@ DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 DynamicLibrary false Unicode - v120 + v140 + + + + + + + + @@ -287,6 +294,18 @@ $(Platform)\obj\$(ProjectName)\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ + + true + + + true + + + true + + + true + echo #define FULL_VERSION "Visual Studio built mono" > ..\mono\mini\version.h @@ -296,7 +315,7 @@ Disabled Default true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -318,8 +337,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) mono.def true false @@ -348,7 +367,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So Disabled Default true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -370,8 +389,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) monosgen.def true false @@ -403,7 +422,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So Disabled Default true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -425,8 +444,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) mono.def true $(Platform)\lib\$(Configuration)\$(TargetName).lib @@ -455,7 +474,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So Disabled Default true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -477,8 +496,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) monosgen.def true $(Platform)\lib\$(Configuration)\$(TargetName).lib @@ -504,7 +523,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So MinSpace OnlyExplicitInline true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -523,8 +542,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) mono.def false @@ -552,7 +571,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So MinSpace OnlyExplicitInline true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,8 +590,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) monosgen.def false @@ -604,7 +623,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So MinSpace OnlyExplicitInline true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -623,8 +642,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) mono.def $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX64 @@ -653,7 +672,7 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So MinSpace OnlyExplicitInline true - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -672,8 +691,8 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoutils.lib;libmonoruntime.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) monosgen.def $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX64 @@ -704,40 +723,6 @@ $(windir)\system32\xcopy /F /Y "$(SolutionDir)..\mono\utils\mono-publib.h" "$(So true - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - true - false - true - false - - - {eb56000b-c80b-4e8b-908d-d84d31b517d3} - true - false - false - true - false - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d739} - false - true - false - true - false - - - {8fc2b0c8-51ad-49df-851f-5d01a77a75e4} - false - true - false - true - false - - diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj index d8f354b7607..79119c91d21 100644 --- a/msvc/libmonoruntime.vcxproj +++ b/msvc/libmonoruntime.vcxproj @@ -1,5 +1,5 @@  - + Debug_SGen @@ -34,7 +34,6 @@ x64 - @@ -87,6 +86,7 @@ + @@ -159,6 +159,7 @@ + @@ -239,76 +240,84 @@ StaticLibrary true Unicode - v120 + v140 StaticLibrary true Unicode - v120 + v140 StaticLibrary true Unicode - v120 + v140 StaticLibrary true Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 + + + + + + + + @@ -354,8 +363,9 @@ Level3 Disabled WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) MultiThreadedDebugDLL + ProgramDatabase Windows @@ -369,7 +379,8 @@ Level3 Disabled WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + ProgramDatabase Windows @@ -383,7 +394,8 @@ Level3 Disabled WIN32;$(BOEHM_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + ProgramDatabase Windows @@ -398,7 +410,8 @@ Disabled WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) false - $(top_srcdir);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);$(top_srcdir)\mono + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + ProgramDatabase Windows @@ -414,7 +427,7 @@ true true WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows @@ -432,7 +445,7 @@ true true WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows @@ -450,7 +463,7 @@ true true WIN32;$(BOEHM_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows @@ -468,7 +481,7 @@ true true WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index 5daad947262..481e6fbcb9a 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,7 +18,6 @@ x64 - @@ -167,25 +166,25 @@ StaticLibrary true Unicode - v120 + v140 StaticLibrary true Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 StaticLibrary false Unicode - v120 + v140 @@ -193,15 +192,19 @@ + + + + @@ -227,7 +230,8 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + ProgramDatabase Windows @@ -244,7 +248,8 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/eglib/src;$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + ProgramDatabase Windows @@ -266,7 +271,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows @@ -287,7 +292,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(top_srcdir);$(top_srcdir)/mono;$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) Windows @@ -306,4 +311,4 @@ - + \ No newline at end of file diff --git a/msvc/libtest.vcxproj b/msvc/libtest.vcxproj index 64aaae18a4a..d7cdafa5068 100644 --- a/msvc/libtest.vcxproj +++ b/msvc/libtest.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -18,7 +18,6 @@ x64 - {5A435710-E6D2-4DD4-9B3F-A7239A32C6F4} libtest @@ -28,37 +27,41 @@ DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 + + + + @@ -79,7 +82,7 @@ Disabled - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -87,14 +90,14 @@ Level3 - EditAndContinue + ProgramDatabase false - Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Windows false @@ -110,7 +113,7 @@ Disabled - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -124,8 +127,8 @@ false - Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Windows $(Platform)\lib\$(Configuration)\$(TargetName).lib @@ -135,7 +138,7 @@ MinSpace - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -147,8 +150,8 @@ false - Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Windows true @@ -166,7 +169,7 @@ MinSpace - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -178,8 +181,8 @@ false - Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Windows true @@ -191,16 +194,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - true - false - false - true - false - - diff --git a/msvc/mono.props b/msvc/mono.props index 23f0ec49c46..aa37ccd7bac 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -2,20 +2,34 @@ $(MSBuildProjectDirectory)\.. - $(top_srcdir)\libgc\include - $(top_srcdir)\eglib\src + $(top_srcdir) + + $(MONO_DIR)\mono + $(MONO_DIR)\eglib;$(MONO_DIR)\eglib\include;$(MONO_DIR)\eglib\test + $(MONO_DIR)\eglib\src + $(MONO_DIR)\libgc\include + $(MONO_DIR)\libgc\src + $(MONO_INCLUDE_DIR)\jit + $(MONO_INCLUDE_DIR)\jit + $(MONO_LIBGC_INCLUDE_DIR) + $(MONO_EGLIB_SOURCE_DIR) HAVE_BOEHM_GC HAVE_SGEN_GC;HAVE_MOVING_COLLECTOR;HAVE_WRITE_BARRIERS + $(ProgramFiles)\Intel\VTune Amplifier XE 2013\include + + + MONO_DLL_EXPORT MONO_DLL_IMPORT - __default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;_UNICODE;UNICODE;WIN32_THREADS;FD_SETSIZE=1024;$(PreprocessorDefinitions);_WINSOCKAPI_ - 4273;4005 + __default_codegen__;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H;GC_NOT_DLL;WIN32_THREADS;WINVER=0x0600;_WIN32_WINNT=0x0600;_WIN32_IE=0x0501;_UNICODE;UNICODE;FD_SETSIZE=1024;%(PreprocessorDefinitions);_WINSOCKAPI_ + 4273;4005 - Mswsock.lib;ws2_32.lib;ole32.lib;oleaut32.lib;psapi.lib;version.lib;advapi32.lib;winmm.lib;kernel32.lib;$(AdditionalDependencies) + Mswsock.lib;ws2_32.lib;ole32.lib;oleaut32.lib;psapi.lib;version.lib;advapi32.lib;winmm.lib;kernel32.lib;%(AdditionalDependencies) + $(Platform)\lib\$(Configuration) - - + + \ No newline at end of file diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index 66f1f0ef99c..c6bb7d51fca 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -1,5 +1,5 @@  - + Debug_SGen @@ -34,7 +34,6 @@ x64 - {A0EDDCD9-940F-432C-A28F-7EF322437D79} mono @@ -44,69 +43,77 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + + + + + @@ -132,10 +139,34 @@ $(ProjectName)-sgen $(ProjectName)-sgen + + false + + + false + + + false + + + false + + + true + + + true + + + true + + + true + Disabled - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -149,8 +180,8 @@ - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -165,7 +196,7 @@ Disabled - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -179,8 +210,8 @@ - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -198,7 +229,7 @@ Disabled - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -214,8 +245,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -227,7 +258,7 @@ Disabled - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -243,8 +274,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -253,7 +284,7 @@ MinSpace - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) MultiThreadedDLL true @@ -266,8 +297,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) Console true true @@ -281,7 +312,7 @@ MinSpace - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) MultiThreadedDLL true @@ -294,8 +325,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console true @@ -312,7 +343,7 @@ MinSpace - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -325,8 +356,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console true @@ -340,7 +371,7 @@ MinSpace - ..\libgc\include;..\;..\;..\jit;..\eglib\src;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -353,8 +384,8 @@ false - %(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console true @@ -365,24 +396,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - true - false - false - true - false - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - true - false - false - true - false - - diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index 9a739c622b3..1dccce00097 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -78,7 +82,7 @@ Disabled - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,12 +96,11 @@ 4996;4018;4244;%(DisableSpecificWarnings) - true + false - - - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -109,7 +112,7 @@ MinSpace - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -119,10 +122,10 @@ ProgramDatabase - true + false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true @@ -131,7 +134,7 @@ MachineX86 - %(AdditionalDependencies) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) @@ -140,11 +143,11 @@ Disabled - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -154,15 +157,15 @@ 4996;4018;4244;%(DisableSpecificWarnings) - true + false - - - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 + NotSet @@ -171,7 +174,7 @@ MinSpace - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -181,16 +184,16 @@ ProgramDatabase - true + false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true true MachineX64 - %(AdditionalDependencies) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) @@ -211,19 +214,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - true - false - true - false - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - - diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index 962d5bacf51..13a71d6b675 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -78,7 +82,7 @@ Disabled - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,8 +99,8 @@ false - ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -108,7 +112,7 @@ MinSpace - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -121,7 +125,7 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true @@ -130,6 +134,7 @@ MachineX86 + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) @@ -138,11 +143,11 @@ Disabled - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -155,8 +160,8 @@ false - ws2_32.lib;libmono.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -168,7 +173,7 @@ MinSpace - ..\;..\eglib\src;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -181,36 +186,19 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true true MachineX64 + eglib.lib;mono-2.0.lib;%(AdditionalDependencies) - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - true - false - true - false - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - false - true - false - true - false - - diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj index df216b7622c..6a043b38673 100644 --- a/msvc/monoposixhelper.vcxproj +++ b/msvc/monoposixhelper.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,37 +27,41 @@ DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 + + + + @@ -82,7 +86,7 @@ Disabled - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) _DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -90,11 +94,11 @@ Level3 - EditAndContinue + ProgramDatabase CompileAsC - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def true @@ -104,7 +108,11 @@ $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX86 + %(AdditionalLibraryDirectories) + + false + @@ -112,7 +120,7 @@ Disabled - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) _DEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -130,13 +138,17 @@ Windows $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX64 - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + false + MinSpace - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) NDEBUG;__i386__;TARGET_X86;i386;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL @@ -146,7 +158,7 @@ CompileAsC - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def true @@ -158,7 +170,11 @@ $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX86 + %(AdditionalLibraryDirectories) + + false + @@ -166,7 +182,7 @@ MinSpace - ..\eglib\src;..\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) NDEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL @@ -184,8 +200,12 @@ true $(Platform)\lib\$(Configuration)\$(TargetName).lib MachineX64 - %(AdditionalDependencies) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + false + @@ -223,15 +243,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {b7098dfa-31e6-4006-8a15-1c9a4e925149} - false - - diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index 275e4c17c95..8962a5c3356 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -78,7 +82,7 @@ Disabled - $(SolutionDir)..\eglib\src\;$(SolutionDir)..\;$(SolutionDir)..\mono\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;%(PreprocessorDefinitions) true EnableFastChecks @@ -98,8 +102,8 @@ false - Psapi.lib;Ws2_32.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -118,14 +122,14 @@ Level3 ProgramDatabase - $(SolutionDir)..\eglib\src\;$(SolutionDir)..\;$(SolutionDir)..\mono\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) false - Psapi.lib;Ws2_32.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console true @@ -142,11 +146,11 @@ Disabled - $(SolutionDir)..\eglib\src\;$(SolutionDir)..\;$(SolutionDir)..\mono\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -162,8 +166,8 @@ false - Psapi.lib;Ws2_32.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -182,14 +186,14 @@ Level3 ProgramDatabase - $(SolutionDir)..\eglib\src\;$(SolutionDir)..\;$(SolutionDir)..\mono\;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) false - Psapi.lib;Ws2_32.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + eglib.lib;libmonoruntime.lib;libmonoutils.lib;libgc.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console true @@ -229,48 +233,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - true - false - true - false - - - {eb56000b-c80b-4e8b-908d-d84d31b517d3} - false - true - false - true - false - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - true - false - false - true - false - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d739} - false - true - false - true - false - - - {8fc2b0c8-51ad-49df-851f-5d01a77a75e4} - false - true - false - true - false - - diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index dcdb2ba6485..fdb0682649d 100644 --- a/msvc/profiler-vtune.vcxproj +++ b/msvc/profiler-vtune.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,37 +27,41 @@ DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 DynamicLibrary Unicode - v120 + v140 + + + + @@ -90,7 +94,7 @@ Level3 ProgramDatabase - ..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src;$(ProgramFiles)\Intel\VTune Amplifier XE 2013\include;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) true @@ -100,8 +104,11 @@ MachineX86 mono-profiler-vtune.def mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies) - $(Platform)\lib;$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) + $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) + + false + @@ -114,7 +121,7 @@ Level3 ProgramDatabase - ..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src;$(ProgramFiles)\Intel\VTune Amplifier XE 2011\include;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) true @@ -122,14 +129,17 @@ true true mono-profiler-vtune.def - mono-2.0.lib;version.lib;libgc.lib;eglib.lib;ws2_32.lib;Psapi.lib;winmm.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies) + $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) + + false + Disabled - ..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src;$(ProgramFiles)\Intel\VTune Amplifier XE 2013\include;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -137,21 +147,24 @@ Level3 - EditAndContinue + ProgramDatabase mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies) - $(Platform)\lib;$(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) + $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) true Windows MachineX86 mono-profiler-vtune.def + + false + Disabled - ..\libgc\include;..\;..\mono\;..\mono\jit;..\mono\eglib\src;..\..\mono\eglib\src;$(ProgramFiles)\Intel\VTune Amplifier XE 2011\include;%(AdditionalIncludeDirectories) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -161,12 +174,15 @@ ProgramDatabase - mono-2.0.lib;version.lib;libgc.lib;eglib.lib;ws2_32.lib;Psapi.lib;winmm.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;libgc.lib;eglib.lib;jitprofiling.lib;%(AdditionalDependencies) + $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) true Windows mono-profiler-vtune.def + + false + diff --git a/msvc/test-invoke.vcxproj b/msvc/test-invoke.vcxproj index 2088fa3f0ac..752d9921273 100644 --- a/msvc/test-invoke.vcxproj +++ b/msvc/test-invoke.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -97,8 +101,8 @@ false - ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -123,7 +127,7 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true @@ -132,6 +136,7 @@ MachineX86 + mono-2.0.lib;%(AdditionalDependencies) @@ -159,8 +164,8 @@ false - glib-2.0.lib;gmodule-2.0.lib;ws2_32.lib;gthread-2.0.lib;gobject-2.0.lib;libmono.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -185,27 +190,18 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true true MachineX64 + mono-2.0.lib;%(AdditionalDependencies) - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - false - false - false - true - false - - diff --git a/msvc/test-metadata.vcxproj b/msvc/test-metadata.vcxproj index 42a5bd68e09..c9860974d1b 100644 --- a/msvc/test-metadata.vcxproj +++ b/msvc/test-metadata.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -78,7 +82,7 @@ Disabled - $(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -97,8 +101,8 @@ false - ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -117,13 +121,13 @@ Level3 ProgramDatabase - $(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true @@ -132,6 +136,7 @@ MachineX86 + mono-2.0.lib;%(AdditionalDependencies) @@ -140,7 +145,7 @@ Disabled - $(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -159,8 +164,8 @@ false - glib-2.0.lib;gmodule-2.0.lib;ws2_32.lib;gthread-2.0.lib;gobject-2.0.lib;libmono.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -179,33 +184,24 @@ Level3 ProgramDatabase - $(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true true MachineX64 + mono-2.0.lib;%(AdditionalDependencies) - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - false - false - false - true - false - - diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index 6986e99de77..7397850e401 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,37 +27,41 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + @@ -71,10 +75,16 @@ $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ + + true + + + true + Disabled - ../eglib/src;../eglib/test;../eglib;../msvc;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,14 +93,14 @@ Level4 false - EditAndContinue + ProgramDatabase false - Ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true false false @@ -102,7 +112,7 @@ MinSpace - ../eglib/src;../eglib/test;../eglib;../msvc;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions) MultiThreadedDLL @@ -115,8 +125,8 @@ false - Ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) false @@ -128,7 +138,7 @@ Disabled - ../eglib/src;../eglib/test;../eglib;../msvc;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,8 +153,8 @@ false - Ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true false false @@ -157,7 +167,7 @@ MinSpace - ../eglib/src;../eglib/test;../eglib;../msvc;%(AdditionalIncludeDirectories) + $(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_FORTIFY_SOURCE=2;%(PreprocessorDefinitions) MultiThreadedDLL @@ -170,8 +180,8 @@ false - Ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)\lib;%(AdditionalLibraryDirectories) + eglib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) MachineX64 @@ -211,16 +221,6 @@ - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - false - false - false - true - false - - diff --git a/msvc/teste.vcxproj b/msvc/teste.vcxproj index 772dd3692c5..fd21380356d 100644 --- a/msvc/teste.vcxproj +++ b/msvc/teste.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,50 +27,54 @@ Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 Application Unicode - v120 + v140 + + + + <_ProjectFileVersion>10.0.30319.1 $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ - false + true $(Platform)\bin\$(Configuration)\ $(Platform)\obj\$(ProjectName)\$(Configuration)\ false @@ -97,8 +101,8 @@ false - ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console false @@ -123,7 +127,7 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true @@ -132,6 +136,7 @@ MachineX86 + mono-2.0.lib;%(AdditionalDependencies) @@ -159,8 +164,8 @@ false - glib-2.0.lib;gmodule-2.0.lib;ws2_32.lib;gthread-2.0.lib;gobject-2.0.lib;libmono.lib;Psapi.lib;%(AdditionalDependencies) - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + mono-2.0.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true Console MachineX64 @@ -185,27 +190,18 @@ false - $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true Console true true MachineX64 + mono-2.0.lib;%(AdditionalDependencies) - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - false - false - false - true - false - - -- cgit v1.2.3