From 52e98abd6e5c6d10ddea91a529f7b1b2336e0696 Mon Sep 17 00:00:00 2001 From: lateralusX Date: Fri, 22 Sep 2017 09:44:04 +0200 Subject: [PATCH] Restructure of mono.sln and build properties to better fix static/dynamic library support. --- mcs/jay/jay.vcxproj | 18 +- mono/mini/mini.h | 2 + msvc/eglib-common.targets | 3 + msvc/eglib-common.targets.filters | 53 +- msvc/eglib-posix.targets.filters | 2 +- msvc/eglib-win32.targets.filters | 18 +- msvc/eglib.targets | 6 + msvc/eglib.targets.filters | 34 + msvc/eglib.vcxproj | 27 +- msvc/eglib.vcxproj.filters | 24 +- msvc/genmdesc.vcxproj | 30 +- msvc/libgc.targets | 94 +++ msvc/libgc.targets.filters | 105 +++ msvc/libgc.vcxproj | 55 +- msvc/libgc.vcxproj.filters | 92 +-- msvc/libgcmonosgen.targets | 163 +++++ msvc/libgcmonosgen.targets.filters | 174 +++++ msvc/libgcmonosgen.vcxproj | 76 +-- msvc/libgcmonosgen.vcxproj.filters | 161 +---- msvc/libmini.targets | 137 ++++ msvc/libmini.targets.filters | 263 ++++++++ msvc/libmini.vcxproj | 198 ++++++ msvc/libmini.vcxproj.filters | 15 + ...ibmono.vcxproj => libmono-dynamic.vcxproj} | 138 ++-- msvc/libmono-dynamic.vcxproj.filters | 31 + msvc/libmono-static.vcxproj | 219 ++----- msvc/libmono-static.vcxproj.filters | 256 +------- msvc/libmono.vcxproj.filters | 24 - msvc/libmonodac.vcxproj | 27 +- msvc/libmonoruntime.targets | 201 ++++++ msvc/libmonoruntime.targets.filters | 619 ++++++++++++++++++ msvc/libmonoruntime.vcxproj | 224 +------ msvc/libmonoruntime.vcxproj.filters | 608 +---------------- msvc/libmonoutils.targets | 198 ++++++ msvc/libmonoutils.targets.filters | 451 +++++++++++++ msvc/libmonoutils.vcxproj | 217 +----- msvc/libmonoutils.vcxproj.filters | 438 +------------ msvc/libtest.vcxproj | 35 +- msvc/mono.props | 6 +- msvc/mono.sln | 56 +- msvc/mono.vcxproj | 48 +- msvc/monodis.vcxproj | 44 +- msvc/monograph.vcxproj | 34 +- msvc/monoposixhelper.targets | 53 ++ msvc/monoposixhelper.targets.filters | 149 +++++ msvc/monoposixhelper.vcxproj | 90 +-- msvc/monoposixhelper.vcxproj.filters | 136 +--- msvc/pedump.vcxproj | 47 +- msvc/profiler-vtune.vcxproj | 43 +- msvc/test-invoke.vcxproj | 47 +- msvc/test-metadata.vcxproj | 41 +- msvc/test_eglib.vcxproj | 30 +- msvc/teste.vcxproj | 49 +- 53 files changed, 3194 insertions(+), 3115 deletions(-) create mode 100644 msvc/eglib.targets create mode 100644 msvc/eglib.targets.filters create mode 100644 msvc/libgc.targets create mode 100644 msvc/libgc.targets.filters create mode 100644 msvc/libgcmonosgen.targets create mode 100644 msvc/libgcmonosgen.targets.filters create mode 100644 msvc/libmini.targets create mode 100644 msvc/libmini.targets.filters create mode 100644 msvc/libmini.vcxproj create mode 100644 msvc/libmini.vcxproj.filters rename msvc/{libmono.vcxproj => libmono-dynamic.vcxproj} (65%) create mode 100644 msvc/libmono-dynamic.vcxproj.filters delete mode 100644 msvc/libmono.vcxproj.filters create mode 100644 msvc/libmonoruntime.targets create mode 100644 msvc/libmonoruntime.targets.filters create mode 100644 msvc/libmonoutils.targets create mode 100644 msvc/libmonoutils.targets.filters create mode 100644 msvc/monoposixhelper.targets create mode 100644 msvc/monoposixhelper.targets.filters diff --git a/mcs/jay/jay.vcxproj b/mcs/jay/jay.vcxproj index 3d6f8c0d4f0..653bb388f7e 100644 --- a/mcs/jay/jay.vcxproj +++ b/mcs/jay/jay.vcxproj @@ -44,27 +44,25 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - false Disabled SKEL_DIRECTORY=".";%(PreprocessorDefinitions) true - EnableFastChecks Level3 - ProgramDatabase - true Console - MachineX86 copy $(OutDir)jay.exe $(ProjectDir)jay.exe + + false + @@ -72,18 +70,18 @@ Level3 - ProgramDatabase + true + true - true Console - true - true - MachineX86 copy $(OutDir)jay.exe $(ProjectDir)jay.exe + + false + diff --git a/mono/mini/mini.h b/mono/mini/mini.h index 42a0356ef83..1ce7a63264a 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -54,9 +54,11 @@ * The mini code should not have any compile time dependencies on the GC being used, so the same object file from mini/ * can be linked into both mono and mono-sgen. */ +#if !defined(MONO_DLL_EXPORT) || !defined(_MSC_VER) #if defined(HAVE_BOEHM_GC) || defined(HAVE_SGEN_GC) #error "The code in mini/ should not depend on these defines." #endif +#endif #ifndef __GNUC__ /*#define __alignof__(a) sizeof(a)*/ diff --git a/msvc/eglib-common.targets b/msvc/eglib-common.targets index fa566976672..3776cd70ec5 100644 --- a/msvc/eglib-common.targets +++ b/msvc/eglib-common.targets @@ -28,4 +28,7 @@ + + + diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters index dcd4a5942fb..e719977b2cf 100644 --- a/msvc/eglib-common.targets.filters +++ b/msvc/eglib-common.targets.filters @@ -2,78 +2,83 @@ - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Source Files\Common + Source Files$(EGLibFilterSubFolder)\Common - Header Files\Common + Header Files$(EGLibFilterSubFolder)\Common - Header Files\Common + Header Files$(EGLibFilterSubFolder)\Common - Header Files\Common + Header Files$(EGLibFilterSubFolder)\Common + + + Resource Files$(EGLibFilterSubFolder) + + diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters index 76265435b14..3a39ceec9a1 100644 --- a/msvc/eglib-posix.targets.filters +++ b/msvc/eglib-posix.targets.filters @@ -2,7 +2,7 @@ - Source Files\Posix + Source Files$(EGLibFilterSubFolder)\Posix diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters index a1ed81ba268..3ed610b8530 100644 --- a/msvc/eglib-win32.targets.filters +++ b/msvc/eglib-win32.targets.filters @@ -2,33 +2,33 @@ - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Source Files\Win32 + Source Files$(EGLibFilterSubFolder)\Win32 - Header Files\Win32 + Header Files$(EGLibFilterSubFolder)\Win32 diff --git a/msvc/eglib.targets b/msvc/eglib.targets new file mode 100644 index 00000000000..5f9d4cd1c90 --- /dev/null +++ b/msvc/eglib.targets @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/msvc/eglib.targets.filters b/msvc/eglib.targets.filters new file mode 100644 index 00000000000..bc155a60439 --- /dev/null +++ b/msvc/eglib.targets.filters @@ -0,0 +1,34 @@ + + + + + + + + {8B3E0DAF-48EA-4B5F-B573-4E8ED8525134} + + + {1277B2DB-F7E8-44C0-9F8B-5933EB5BD879} + + + {9B2D78CC-201F-48DF-8710-839BCDB0AEE9} + + + + + {04853f35-873a-4b07-990a-61dc8ebd5105} + + + {80953075-5d05-41b9-be90-82497081b11c} + + + {7a01f670-6a6a-4837-b3ac-cd6c08075b4e} + + + {c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d} + + + {3c958a68-b6a1-40d3-834c-b50be09cb819} + + + diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index e4f706775c3..c4845c36745 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -1,4 +1,4 @@ - + @@ -84,14 +84,12 @@ Disabled $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) - true - EnableFastChecks Level4 - ProgramDatabase WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + true @@ -100,14 +98,14 @@ - MinSpace $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) Level4 - ProgramDatabase WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + true + true @@ -121,14 +119,12 @@ Disabled $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) - true - EnableFastChecks Level4 - ProgramDatabase WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + true @@ -140,28 +136,23 @@ X64 - MinSpace $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories) Level4 - ProgramDatabase WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + true + true - - - + {92ae7622-5f58-4234-9a26-9ec71876b3f4} - - - - + \ No newline at end of file diff --git a/msvc/eglib.vcxproj.filters b/msvc/eglib.vcxproj.filters index 3805150c83a..8836550d6cd 100644 --- a/msvc/eglib.vcxproj.filters +++ b/msvc/eglib.vcxproj.filters @@ -1,8 +1,6 @@  - - - + {d16b81e3-5093-424e-a5d4-e7dd8da49dce} @@ -13,25 +11,5 @@ {38a39ff1-842b-431b-b54b-24094e8283eb} - - {04853f35-873a-4b07-990a-61dc8ebd5105} - - - {80953075-5d05-41b9-be90-82497081b11c} - - - {7a01f670-6a6a-4837-b3ac-cd6c08075b4e} - - - {c6e3ed6c-6b52-4823-bc4f-2dc9f84e3f5d} - - - {3c958a68-b6a1-40d3-834c-b50be09cb819} - - - - - Resource Files - diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index b6a4a81c135..e89ff36571d 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -108,13 +108,9 @@ $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks Level3 - true - ProgramDatabase - CompileAsC _DEBUG;%(PreprocessorDefinitions) @@ -127,9 +123,7 @@ eglib.lib;%(AdditionalDependencies) true %(AdditionalLibraryDirectories) - true Console - MachineX86 @@ -155,13 +149,9 @@ $(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 Level3 - true - ProgramDatabase - CompileAsC _DEBUG;%(PreprocessorDefinitions) @@ -172,11 +162,8 @@ eglib.lib;%(AdditionalDependencies) - true %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -203,16 +190,13 @@ - MinSpace - OnlyExplicitInline $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions) true - true Level3 - true + true NDEBUG;%(PreprocessorDefinitions) @@ -223,11 +207,8 @@ eglib.lib;%(AdditionalDependencies) - true %(AdditionalLibraryDirectories) Console - MachineX86 - true @@ -249,17 +230,13 @@ - MinSpace - OnlyExplicitInline $(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 - true Level3 - true - CompileAsC + true NDEBUG;%(PreprocessorDefinitions) @@ -270,11 +247,8 @@ eglib.lib;%(AdditionalDependencies) - true %(AdditionalLibraryDirectories) Console - MachineX64 - true diff --git a/msvc/libgc.targets b/msvc/libgc.targets new file mode 100644 index 00000000000..e2d3808bbfa --- /dev/null +++ b/msvc/libgc.targets @@ -0,0 +1,94 @@ + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + \ No newline at end of file diff --git a/msvc/libgc.targets.filters b/msvc/libgc.targets.filters new file mode 100644 index 00000000000..a4e98eb83f7 --- /dev/null +++ b/msvc/libgc.targets.filters @@ -0,0 +1,105 @@ + + + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + Source Files$(GCboehmFilterSubFolder) + + + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + Header Files$(GCboehmFilterSubFolder) + + + + + {9671D54B-CA64-4CFA-89BD-D90D90D38F6B} + + + {AA2FEF48-1466-481B-AA60-BF0DA57967BC} + + + {67EC6108-4A9F-4B19-B019-734A71CDFE30} + + + \ No newline at end of file diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 60a246b16b5..5f9fe4a265c 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -82,27 +82,24 @@ $(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 - ProgramDatabase - CompileAsC 4311;4312;4996;4005;%(DisableSpecificWarnings) - Level1 + Level3 $(IntDir)$(TargetName).pdb - MinSpace $(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) - ProgramDatabase - CompileAsC $(IntDir)$(TargetName).pdb + Level3 + true + true @@ -115,13 +112,11 @@ $(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 - ProgramDatabase - CompileAsC 4311;4312;4996;4005;%(DisableSpecificWarnings) $(IntDir)$(TargetName).pdb + Level3 @@ -130,50 +125,18 @@ X64 - MinSpace $(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) - ProgramDatabase - CompileAsC $(IntDir)$(TargetName).pdb + Level3 + true + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/msvc/libgc.vcxproj.filters b/msvc/libgc.vcxproj.filters index 6453cc0645f..6b0061f7ff6 100644 --- a/msvc/libgc.vcxproj.filters +++ b/msvc/libgc.vcxproj.filters @@ -1,96 +1,6 @@  - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + {699a2844-7533-4292-9d33-c8f0ff83fc43} diff --git a/msvc/libgcmonosgen.targets b/msvc/libgcmonosgen.targets new file mode 100644 index 00000000000..aba5c4343bf --- /dev/null +++ b/msvc/libgcmonosgen.targets @@ -0,0 +1,163 @@ + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + \ No newline at end of file diff --git a/msvc/libgcmonosgen.targets.filters b/msvc/libgcmonosgen.targets.filters new file mode 100644 index 00000000000..6713a534ff2 --- /dev/null +++ b/msvc/libgcmonosgen.targets.filters @@ -0,0 +1,174 @@ + + + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + Source Files$(MonoGCsgenFilterSubFolder) + + + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + Header Files$(MonoGCsgenFilterSubFolder) + + + + + {09852EE2-29A8-4C5A-9DE0-748F4113132B} + + + {D551BA3A-A20D-4FB2-BFF4-0174A3CB19E1} + + + {37293C0E-9158-42C3-BE90-8FE4B63CDFF5} + + + \ No newline at end of file diff --git a/msvc/libgcmonosgen.vcxproj b/msvc/libgcmonosgen.vcxproj index e0979dbbee0..f27c6652da1 100644 --- a/msvc/libgcmonosgen.vcxproj +++ b/msvc/libgcmonosgen.vcxproj @@ -18,62 +18,6 @@ x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {C36612BD-22D3-4B95-85E2-7FDC4FC5D740} Win32Proj @@ -152,10 +96,10 @@ Level3 Disabled - WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;_DEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -168,11 +112,10 @@ Level3 Disabled - WIN32;$(SGEN_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) - false + WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;_DEBUG;WIN64;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -184,12 +127,11 @@ Level3 - MaxSpeed - true true - WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;NDEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -203,12 +145,11 @@ Level3 - MaxSpeed - true true - WIN32;$(SGEN_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;$(SGEN_DEFINES);_LIB;NDEBUG;WIN64;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -217,6 +158,7 @@ true + diff --git a/msvc/libgcmonosgen.vcxproj.filters b/msvc/libgcmonosgen.vcxproj.filters index b1c22545a6c..f4982279c42 100644 --- a/msvc/libgcmonosgen.vcxproj.filters +++ b/msvc/libgcmonosgen.vcxproj.filters @@ -1,165 +1,6 @@  - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + {62eb1a19-26dd-4c17-8bd0-0a734673637d} diff --git a/msvc/libmini.targets b/msvc/libmini.targets new file mode 100644 index 00000000000..50ebafb980b --- /dev/null +++ b/msvc/libmini.targets @@ -0,0 +1,137 @@ + + + + + + + true + true + + + true + true + + + true + true + + + true + true + + + + + true + true + + + true + true + + + + + + + + true + true + + + true + true + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + true + true + + + + + + diff --git a/msvc/libmini.targets.filters b/msvc/libmini.targets.filters new file mode 100644 index 00000000000..87f8e5e3df7 --- /dev/null +++ b/msvc/libmini.targets.filters @@ -0,0 +1,263 @@ + + + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + Source Files$(MonoMiniFilterSubFolder) + + + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + Header Files$(MonoMiniFilterSubFolder) + + + + + Resource Files$(MonoMiniFilterSubFolder) + + + + + {b64924de-7e02-416b-9779-4cc7fe0270e6} + + + {95531242-a8da-43ec-9ddb-6da7551d9c2d} + + + {f66c7e0f-6887-449d-81a5-49168ddfc4db} + + + diff --git a/msvc/libmini.vcxproj b/msvc/libmini.vcxproj new file mode 100644 index 00000000000..a0cd5a22319 --- /dev/null +++ b/msvc/libmini.vcxproj @@ -0,0 +1,198 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + {158073ed-99ae-4196-9edc-ddb2344f8466} + + + + {88D2EB79-592D-45F8-B849-AE021C1D983A} + libmini + 8.1 + + + + StaticLibrary + Unicode + v140 + + + StaticLibrary + Unicode + v140 + + + StaticLibrary + Unicode + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + $(ProjectName)$(MONO_TARGET_SUFFIX) + $(ProjectName)$(MONO_TARGET_SUFFIX) + $(ProjectName)$(MONO_TARGET_SUFFIX) + $(ProjectName)$(MONO_TARGET_SUFFIX) + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ + $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ + + + true + + + true + + + + + + + + /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) + Disabled + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions) + + + 4996;4018;4244;%(DisableSpecificWarnings) + $(IntDir)$(TargetName).pdb + Level3 + true + + + Windows + + + + %(AdditionalLibraryDirectories) + + + + + + + + + /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) + Disabled + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions) + + + 4996;4018;4244;%(DisableSpecificWarnings) + $(IntDir)$(TargetName).pdb + Level3 + true + + + Windows + + + + %(AdditionalLibraryDirectories) + + + + + + + + + /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) + true + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions) + + + $(IntDir)$(TargetName).pdb + Level3 + true + + + Windows + true + true + + + + %(AdditionalLibraryDirectories) + + + + + + + + + /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) + true + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions) + + + $(IntDir)$(TargetName).pdb + Level3 + true + + + Windows + true + true + + + + %(AdditionalLibraryDirectories) + + + + + + + \ No newline at end of file diff --git a/msvc/libmini.vcxproj.filters b/msvc/libmini.vcxproj.filters new file mode 100644 index 00000000000..c66a747d501 --- /dev/null +++ b/msvc/libmini.vcxproj.filters @@ -0,0 +1,15 @@ + + + + + + {30FB3E7A-9BC7-47A9-BABB-D34F7CD6F466} + + + {A4810F67-8B76-40A9-9A43-6048BC8A65F1} + + + {3E49E932-95E1-4900-89D8-0ABFD8094726} + + + \ No newline at end of file diff --git a/msvc/libmono.vcxproj b/msvc/libmono-dynamic.vcxproj similarity index 65% rename from msvc/libmono.vcxproj rename to msvc/libmono-dynamic.vcxproj index 50fe92351f6..186bd7ffc31 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono-dynamic.vcxproj @@ -19,8 +19,8 @@ - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} - libmono + {675F4175-FFB1-480D-AD36-F397578844D4} + libmono-dynamic 8.1 @@ -97,38 +97,29 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - Default - true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;_DEBUG;%(PreprocessorDefinitions) - - - true - ProgramDatabase - CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) + Level3 + true _DEBUG;%(PreprocessorDefinitions) 0x0409 - true + false - $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) + $(GC_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - $(MONO_DEF) - true - false + + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - $(OutDir)$(TargetName).pdb .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q @@ -145,35 +136,27 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - Default - true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;_DEBUG;%(PreprocessorDefinitions) - - - true - ProgramDatabase - CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) + Level3 + true _DEBUG;%(PreprocessorDefinitions) 0x0409 - true + false - $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) + $(GC_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - $(MONO_DEF) - true + + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q @@ -186,39 +169,34 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) - MinSpace - OnlyExplicitInline true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;NDEBUG;%(PreprocessorDefinitions) true - true - - - CompileAsC + Level3 NDEBUG;%(PreprocessorDefinitions) 0x0409 - - true - + - $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) + $(GC_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - $(MONO_DEF) - false + + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - true .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q + + false + @@ -230,77 +208,49 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) - MinSpace - OnlyExplicitInline true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);MONO_DLL_EXPORT;WIN64;NDEBUG;%(PreprocessorDefinitions) true - true - - - CompileAsC + Level3 NDEBUG;%(PreprocessorDefinitions) 0x0409 - - true - + - $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) + $(GC_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - $(MONO_DEF) + + $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 - true .\libmono.bat "$(MONO_INCLUDE_DIR)" "$(SolutionDir)include\mono" -q + + false + - - true - true - - - true - true - - - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - {b7098dfa-31e6-4006-8a15-1c9a4e925149} {eb56000b-c80b-4e8b-908d-d84d31b517d3} - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d740} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0772} - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d739} - - - {8fc2b0c8-51ad-49df-851f-5d01a77a75e4} - - - - - + + + + + + diff --git a/msvc/libmono-dynamic.vcxproj.filters b/msvc/libmono-dynamic.vcxproj.filters new file mode 100644 index 00000000000..dcdb261e742 --- /dev/null +++ b/msvc/libmono-dynamic.vcxproj.filters @@ -0,0 +1,31 @@ + + + + \libmonoutils + \libmonoruntime + \libmini + \libgcmonosgen + \eglib + + + + + + + + + {09693EC3-6099-43FF-A22D-D0651643B146} + + + {851A7AF5-8521-4F03-9527-D162FB53D9E7} + + + {58EC90AB-A91B-433C-AE1E-6B09A6D43A3E} + + + + + Source Files + + + \ No newline at end of file diff --git a/msvc/libmono-static.vcxproj b/msvc/libmono-static.vcxproj index 3554a60c039..0c606ddb6af 100644 --- a/msvc/libmono-static.vcxproj +++ b/msvc/libmono-static.vcxproj @@ -18,128 +18,6 @@ x64 - - - - - true - true - - - true - true - - - true - true - - - true - true - - - - - true - true - - - true - true - - - - - - - - - true - true - - - true - true - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - {CB0D9E92-293C-439C-9AC7-C5F59B6E0772} libmono-static @@ -214,25 +92,24 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;%(PreprocessorDefinitions) - false - ProgramDatabase 4996;4018;4244;%(DisableSpecificWarnings) $(IntDir)$(TargetName).pdb + Level3 + true Windows - - %(AdditionalLibraryDirectories) - eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies) - + + + + true + @@ -242,25 +119,24 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;%(PreprocessorDefinitions) - false - ProgramDatabase 4996;4018;4244;%(DisableSpecificWarnings) $(IntDir)$(TargetName).pdb + Level3 + true Windows - - %(AdditionalLibraryDirectories) - eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies) - + + + + true + @@ -269,14 +145,14 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) - MaxSpeed true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + Level3 + true Windows @@ -284,10 +160,11 @@ true - - %(AdditionalLibraryDirectories) - eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies) - + + + + true + @@ -296,14 +173,14 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) - MaxSpeed true - $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) - true + $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pdb + Level3 + true Windows @@ -311,34 +188,25 @@ true - - %(AdditionalLibraryDirectories) - eglib.lib;$(MONO_RUNTIME_LIBS);%(AdditionalDependencies) - + + + + true + - - - true - true - - - true - true - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - {b7098dfa-31e6-4006-8a15-1c9a4e925149} - - + {eb56000b-c80b-4e8b-908d-d84d31b517d3} - + {c36612bd-22d3-4b95-85e2-7fdc4fc5d740} + + {88d2eb79-592d-45f8-b849-ae021c1d983a} + {c36612bd-22d3-4b95-85e2-7fdc4fc5d739} @@ -346,10 +214,7 @@ {8fc2b0c8-51ad-49df-851f-5d01a77a75e4} - - - - + \ No newline at end of file diff --git a/msvc/libmono-static.vcxproj.filters b/msvc/libmono-static.vcxproj.filters index 672e6052f41..0d407ea4f94 100644 --- a/msvc/libmono-static.vcxproj.filters +++ b/msvc/libmono-static.vcxproj.filters @@ -1,252 +1,5 @@ - + - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - {bdc9f80b-3045-49d2-bb7b-510450371395} @@ -258,9 +11,4 @@ {5370c3c4-b6ec-4f8a-8b21-ce4e782720a6} - - - Resource Files - - - + \ No newline at end of file diff --git a/msvc/libmono.vcxproj.filters b/msvc/libmono.vcxproj.filters deleted file mode 100644 index 91861b6cc1d..00000000000 --- a/msvc/libmono.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {bdc9f80b-3045-49d2-bb7b-510450371395} - - - {f7700495-afaa-4d16-9aac-79d54d10de23} - - - {5370c3c4-b6ec-4f8a-8b21-ce4e782720a6} - - - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/msvc/libmonodac.vcxproj b/msvc/libmonodac.vcxproj index 02308913f62..b016f7b9007 100644 --- a/msvc/libmonodac.vcxproj +++ b/msvc/libmonodac.vcxproj @@ -63,35 +63,28 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) Disabled - Default - true $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;_DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - true - ProgramDatabase - CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) + Level3 + true _DEBUG;%(PreprocessorDefinitions) 0x0409 - true + false %(AdditionalLibraryDirectories) - true $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 %(AdditionalDependencies) @@ -109,33 +102,28 @@ /D /NODEFAULTLIB:LIBCD" " %(AdditionalOptions) - MinSpace - OnlyExplicitInline true $(MONO_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions) true - true - CompileAsC + Level3 NDEBUG;%(PreprocessorDefinitions) 0x0409 - true + false %(AdditionalLibraryDirectories) $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 - true %(AdditionalDependencies) @@ -143,11 +131,6 @@ - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - - diff --git a/msvc/libmonoruntime.targets b/msvc/libmonoruntime.targets new file mode 100644 index 00000000000..13dbf5d16c3 --- /dev/null +++ b/msvc/libmonoruntime.targets @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/libmonoruntime.targets.filters b/msvc/libmonoruntime.targets.filters new file mode 100644 index 00000000000..8a3f56968a0 --- /dev/null +++ b/msvc/libmonoruntime.targets.filters @@ -0,0 +1,619 @@ + + + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder)\boehm + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\gc + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder)\sgen + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + Source Files$(MonoRuntimeFilterSubFolder) + + + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder)\sgen + + + Header Files$(MonoRuntimeFilterSubFolder)\sgen + + + Header Files$(MonoRuntimeFilterSubFolder)\sgen + + + Header Files$(MonoRuntimeFilterSubFolder)\sgen + + + Header Files$(MonoRuntimeFilterSubFolder)\gc + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + Header Files$(MonoRuntimeFilterSubFolder) + + + + + Resource Files$(MonoRuntimeFilterSubFolder) + + + + + {992766FD-0584-4B49-A4F7-B59947CD8488} + + + {12D2E658-65D0-48E9-8F7A-6355482F17DA} + + + {DC656245-EE35-4C36-AA40-A109905666F3} + + + + + {728e57f8-14d3-42f4-b92a-be03cd2acdfa} + + + {d5996ea0-8b43-4267-a46c-715270aaee2b} + + + {2446a0bf-5f8b-4789-91ab-6107f72b8539} + + + {5fede250-d478-466b-aa2a-36d2222de065} + + + {410dd556-6715-4c4e-beff-c5dd7a6b78a1} + + + {e37c9a88-bfb3-47dd-948c-a74dea25b3ad} + + + \ No newline at end of file diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj index 84c3083b3a1..b9b512dddb3 100644 --- a/msvc/libmonoruntime.vcxproj +++ b/msvc/libmonoruntime.vcxproj @@ -1,4 +1,4 @@ - + @@ -18,212 +18,11 @@ x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} Win32Proj @@ -301,10 +100,10 @@ Level3 Disabled - WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);_DEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -318,10 +117,10 @@ Level3 Disabled - WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);WIN64;_DEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -334,12 +133,11 @@ Level3 - MaxSpeed - true true - WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);NDEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -354,12 +152,11 @@ Level3 - MaxSpeed - true true - WIN32;WIN32_LEAN_AND_MEAN;$(GC_DEFINES);NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;_LIB;$(GC_DEFINES);WIN64;NDEBUG;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -369,7 +166,8 @@ + - + \ No newline at end of file diff --git a/msvc/libmonoruntime.vcxproj.filters b/msvc/libmonoruntime.vcxproj.filters index ce8d2a1b1b1..3ac14af4471 100644 --- a/msvc/libmonoruntime.vcxproj.filters +++ b/msvc/libmonoruntime.vcxproj.filters @@ -1,585 +1,6 @@ - + - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\boehm - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\gc - - - Source Files\sgen - - - Source Files\sgen - - - Source Files\sgen - - - Source Files\sgen - - - Source Files\sgen - - - Source Files\sgen - - - Source Files\sgen - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\sgen - - - Header Files\sgen - - - Header Files\sgen - - - Header Files\sgen - - - Header Files\gc - - - Header Files\gc - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + {eb8a6a4d-924c-494d-99c1-663e4c09a806} @@ -590,28 +11,5 @@ {3f4ff222-41cc-4bbc-b36b-cac0c21266ad} - - {728e57f8-14d3-42f4-b92a-be03cd2acdfa} - - - {d5996ea0-8b43-4267-a46c-715270aaee2b} - - - {2446a0bf-5f8b-4789-91ab-6107f72b8539} - - - {5fede250-d478-466b-aa2a-36d2222de065} - - - {410dd556-6715-4c4e-beff-c5dd7a6b78a1} - - - {e37c9a88-bfb3-47dd-948c-a74dea25b3ad} - - - - - Resource Files - - + \ No newline at end of file diff --git a/msvc/libmonoutils.targets b/msvc/libmonoutils.targets new file mode 100644 index 00000000000..50865a483fe --- /dev/null +++ b/msvc/libmonoutils.targets @@ -0,0 +1,198 @@ + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + true + true + X64 + + + + + + + + + + diff --git a/msvc/libmonoutils.targets.filters b/msvc/libmonoutils.targets.filters new file mode 100644 index 00000000000..50154182a4e --- /dev/null +++ b/msvc/libmonoutils.targets.filters @@ -0,0 +1,451 @@ + + + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + Source Files$(MonoUtilsFilterSubFolder) + + + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + Header Files$(MonoUtilsFilterSubFolder) + + + + + Resource Files$(MonoUtilsFilterSubFolder) + + + + + Resource Files$(MonoUtilsFilterSubFolder) + + + + + {CFB7113E-BF38-420B-ADCE-D737EDD7C91A} + + + {CF1B494F-7FC7-4B1F-9356-1E6F4C3AA151} + + + {6603FB44-3F5A-490C-A2FB-3FCD4818EA6A} + + + diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index beba4278b8e..fd727132bc6 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -18,201 +18,11 @@ x64 - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - true - true - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} Win32Proj @@ -245,9 +55,6 @@ v140 - - - @@ -289,8 +96,8 @@ Disabled WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -307,10 +114,10 @@ Level3 Disabled - WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) - ProgramDatabase $(IntDir)$(TargetName).pdb + ProgramDatabase Windows @@ -320,21 +127,17 @@ - - X64 - Level3 - MaxSpeed - true true WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -352,12 +155,11 @@ Level3 - MaxSpeed - true true - WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions) $(MONO_DIR);$(MONO_INCLUDE_DIR);$(LIBGC_CPPFLAGS_INCLUDE);$(GLIB_CFLAGS_INCLUDE);%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + true Windows @@ -369,12 +171,7 @@ - - X64 - + - - - \ No newline at end of file diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters index e4b82690a18..def4467d313 100644 --- a/msvc/libmonoutils.vcxproj.filters +++ b/msvc/libmonoutils.vcxproj.filters @@ -1,432 +1,6 @@  - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + {7d1240fd-7e95-4e21-ab1a-365dd69355de} @@ -438,14 +12,4 @@ {82f9c5a2-bc7b-4424-ae85-a203027fd038} - - - Resource Files - - - - - Resource Files - - \ No newline at end of file diff --git a/msvc/libtest.vcxproj b/msvc/libtest.vcxproj index 27a44e3ae8c..a6d25fbb2b1 100644 --- a/msvc/libtest.vcxproj +++ b/msvc/libtest.vcxproj @@ -75,10 +75,8 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - false @@ -86,11 +84,9 @@ $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) true - EnableFastChecks Level3 - ProgramDatabase false @@ -98,13 +94,9 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - Windows - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX86 @@ -116,11 +108,9 @@ $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) true - EnableFastChecks Level3 - ProgramDatabase false @@ -128,21 +118,18 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - Windows $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 - MinSpace $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false @@ -150,15 +137,9 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - Windows - true - true - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX86 @@ -166,13 +147,13 @@ X64 - MinSpace $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EXPORTS;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false @@ -180,12 +161,7 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - Windows - true - true $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 @@ -195,9 +171,6 @@ {158073ed-99ae-4196-9edc-ddb2344f8466} - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - diff --git a/msvc/mono.props b/msvc/mono.props index 22b1d59fec2..42c56e0f178 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -1,4 +1,4 @@ - + @@ -55,7 +55,7 @@ $(MONO_BUILD_DIR_PREFIX)boehm/ - libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;$(GC_LIB) + libmonoutils.lib;libmonoruntime$(MONO_TARGET_SUFFIX).lib;libmini$(MONO_TARGET_SUFFIX).lib;$(GC_LIB) libmono-static$(MONO_TARGET_SUFFIX).lib mono-2.0$(MONO_TARGET_SUFFIX).lib @@ -107,4 +107,4 @@ $(MONO_BUILD_DIR_PREFIX)$(Platform)/lib/$(Configuration) - + \ No newline at end of file diff --git a/msvc/mono.sln b/msvc/mono.sln index 4a8ecd3326e..ac103fb6ea6 100644 --- a/msvc/mono.sln +++ b/msvc/mono.sln @@ -16,34 +16,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmdesc", "genmdesc.vcxpro {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "libmono.vcxproj", "{CB0D9E92-293C-439C-9AC7-C5F59B6E0771}" - ProjectSection(ProjectDependencies) = postProject - {EB56000B-C80B-4E8B-908D-D84D31B517D3} = {EB56000B-C80B-4E8B-908D-D84D31B517D3} - {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} - {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} = {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} - {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} - {B7098DFA-31E6-4006-8A15-1C9A4E925149} = {B7098DFA-31E6-4006-8A15-1C9A4E925149} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-invoke", "test-invoke.vcxproj", "{C5639B3F-288A-4A4B-A4A5-C0D85834221D}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teste", "teste.vcxproj", "{6FDE4E5E-57D0-432F-A987-6C226A7827E4}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono", "mono.vcxproj", "{A0EDDCD9-940F-432C-A28F-7EF322437D79}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject @@ -55,28 +42,24 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monodis", "monodis.vcxproj", "{37F50E5A-4818-46CF-81FE-4BB06DE5D42E}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pedump", "pedump.vcxproj", "{84C7DB50-D6F8-4C47-B22C-6BB203AEB4D3}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monograph", "monograph.vcxproj", "{CA2A69D6-3B9D-45A5-8BF7-4E242E683122}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-metadata", "test-metadata.vcxproj", "{C2EB666E-9146-4B7A-85F6-25F9EA313770}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject @@ -88,14 +71,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_eglib", "test_eglib.vcxproj", "{80A0620A-3478-4E1A-AA7C-0D2387B892AB}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest", "libtest.vcxproj", "{5A435710-E6D2-4DD4-9B3F-A7239A32C6F4}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject @@ -115,7 +96,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-vtune", "profiler-vtune.vcxproj", "{F51017F9-B7FB-4F87-B7B5-12799D965783}" ProjectSection(ProjectDependencies) = postProject {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466} EndProjectSection EndProject @@ -147,7 +127,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-all", "build-all.vcxp {37F50E5A-4818-46CF-81FE-4BB06DE5D42E} = {37F50E5A-4818-46CF-81FE-4BB06DE5D42E} {6FDE4E5E-57D0-432F-A987-6C226A7827E4} = {6FDE4E5E-57D0-432F-A987-6C226A7827E4} {C2EB666E-9146-4B7A-85F6-25F9EA313770} = {C2EB666E-9146-4B7A-85F6-25F9EA313770} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {C36612BD-22D3-4B95-85E2-7FDC4FC5D739} {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} = {8FC2B0C8-51AD-49DF-851F-5D01A77A75E4} {CA2A69D6-3B9D-45A5-8BF7-4E242E683122} = {CA2A69D6-3B9D-45A5-8BF7-4E242E683122} @@ -212,6 +191,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-nunit-test", "mono-nun EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmonodac", "libmonodac.vcxproj", "{DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmini", "libmini.vcxproj", "{88D2EB79-592D-45F8-B849-AE021C1D983A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono-dynamic", "libmono-dynamic.vcxproj", "{675F4175-FFB1-480D-AD36-F397578844D4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -228,14 +211,6 @@ Global {B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|Win32.Build.0 = Release|Win32 {B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|x64.ActiveCfg = Release|x64 {B7098DFA-31E6-4006-8A15-1C9A4E925149}.Release|x64.Build.0 = Release|x64 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Win32.ActiveCfg = Debug|Win32 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|Win32.Build.0 = Debug|Win32 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|x64.ActiveCfg = Debug|x64 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Debug|x64.Build.0 = Debug|x64 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Win32.ActiveCfg = Release|Win32 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|Win32.Build.0 = Release|Win32 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|x64.ActiveCfg = Release|x64 - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}.Release|x64.Build.0 = Release|x64 {C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|Win32.ActiveCfg = Debug|Win32 {C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|Win32.Build.0 = Debug|Win32 {C5639B3F-288A-4A4B-A4A5-C0D85834221D}.Debug|x64.ActiveCfg = Debug|x64 @@ -420,13 +395,28 @@ Global {DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|Win32.ActiveCfg = Release|x64 {DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|x64.ActiveCfg = Release|x64 {DC50997D-8A0D-4EB6-849B-9D7FBC39CE53}.Release|x64.Build.0 = Release|x64 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|Win32.ActiveCfg = Debug|Win32 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|Win32.Build.0 = Debug|Win32 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|x64.ActiveCfg = Debug|x64 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Debug|x64.Build.0 = Debug|x64 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|Win32.ActiveCfg = Release|Win32 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|Win32.Build.0 = Release|Win32 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|x64.ActiveCfg = Release|x64 + {88D2EB79-592D-45F8-B849-AE021C1D983A}.Release|x64.Build.0 = Release|x64 + {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|Win32.Build.0 = Debug|Win32 + {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|x64.ActiveCfg = Debug|x64 + {675F4175-FFB1-480D-AD36-F397578844D4}.Debug|x64.Build.0 = Debug|x64 + {675F4175-FFB1-480D-AD36-F397578844D4}.Release|Win32.ActiveCfg = Release|Win32 + {675F4175-FFB1-480D-AD36-F397578844D4}.Release|Win32.Build.0 = Release|Win32 + {675F4175-FFB1-480D-AD36-F397578844D4}.Release|x64.ActiveCfg = Release|x64 + {675F4175-FFB1-480D-AD36-F397578844D4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {B7098DFA-31E6-4006-8A15-1C9A4E925149} = {EE2CC761-9652-44AC-9204-7EB31194CAA6} - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F} {C5639B3F-288A-4A4B-A4A5-C0D85834221D} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC} {6FDE4E5E-57D0-432F-A987-6C226A7827E4} = {5FE09AA5-C3C9-45EA-A323-36A11B653CEC} {A0EDDCD9-940F-432C-A28F-7EF322437D79} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F} @@ -457,11 +447,13 @@ Global {7BECCFA0-28A0-4995-9856-558560F720E6} = {A0068765-334B-414C-8E21-8376CD2EC9F6} {0046B994-40A8-4C64-AC9D-429DC9177B54} = {A0068765-334B-414C-8E21-8376CD2EC9F6} {DC50997D-8A0D-4EB6-849B-9D7FBC39CE53} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F} + {88D2EB79-592D-45F8-B849-AE021C1D983A} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1} + {675F4175-FFB1-480D-AD36-F397578844D4} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - AMDCaPersistentConfig = Debug|Win32 - AMDCaPersistentStartup = mono AMDCaProjectFile = C:\Users\Owner\Development\monogit\mono\msvc\CodeAnalyst\mono.caw + AMDCaPersistentStartup = mono + AMDCaPersistentConfig = Debug|Win32 EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index 59cf0bd1b83..0c3eba152b2 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -77,11 +77,9 @@ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -96,25 +94,20 @@ Disabled $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) + Level3 $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 false @@ -127,14 +120,12 @@ Disabled $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) - WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) + Level3 false @@ -142,22 +133,20 @@ $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) - ProgramDatabase - CompileAsC - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + true + true false @@ -166,13 +155,8 @@ $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) Console - true - true - false - MachineX86 - true @@ -180,13 +164,13 @@ X64 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_LIBGC_SOURCE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) - WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;WIN32_LEAN_AND_MEAN;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - CompileAsC + Level3 + true + true false @@ -194,11 +178,7 @@ $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 @@ -208,8 +188,8 @@ {158073ed-99ae-4196-9edc-ddb2344f8466} - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index c7afb945a20..9f0bb69efb9 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -98,12 +96,9 @@ $(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 Level3 - ProgramDatabase - CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -112,37 +107,29 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - false - MachineX86 $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -155,12 +142,9 @@ $(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 Level3 - ProgramDatabase - CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -169,10 +153,7 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 - NotSet @@ -180,24 +161,20 @@ X64 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -220,17 +197,8 @@ - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {eb56000b-c80b-4e8b-908d-d84d31b517d3} - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d740} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {cb0d9e92-293c-439c-9ac7-c5f59b6e0772} diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index db342010c2f..022665893f8 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -98,12 +96,9 @@ $(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 Level3 - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) @@ -112,37 +107,29 @@ $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - false - MachineX86 $(MONO_LIBMONO_LIB);%(AdditionalDependencies) @@ -155,12 +142,9 @@ $(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 Level3 - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) @@ -169,9 +153,7 @@ $(MONO_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -179,24 +161,20 @@ X64 - MinSpace $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 $(MONO_LIBMONO_LIB);%(AdditionalDependencies) @@ -208,8 +186,8 @@ {158073ed-99ae-4196-9edc-ddb2344f8466} - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} diff --git a/msvc/monoposixhelper.targets b/msvc/monoposixhelper.targets new file mode 100644 index 00000000000..4a00ec1f344 --- /dev/null +++ b/msvc/monoposixhelper.targets @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/monoposixhelper.targets.filters b/msvc/monoposixhelper.targets.filters new file mode 100644 index 00000000000..e82ea140796 --- /dev/null +++ b/msvc/monoposixhelper.targets.filters @@ -0,0 +1,149 @@ + + + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + Source Files$(MonoPosixHelperFilterSubFolder) + + + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + Header Files$(MonoPosixHelperFilterSubFolder) + + + + + Resource Files$(MonoPosixHelperFilterSubFolder) + + + + + {BFBB15BB-C843-4A56-8909-B832B33FED9B} + + + {C024824E-DFC4-4A50-AA57-AA7F1B4B014E} + + + {E91A4E9A-3F86-4412-BBA5-8C2F3C243845} + + + \ No newline at end of file diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj index 8ea0b2ddbb4..9d026fc835b 100644 --- a/msvc/monoposixhelper.vcxproj +++ b/msvc/monoposixhelper.vcxproj @@ -75,10 +75,8 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\ - false MonoPosixHelper MonoPosixHelper MonoPosixHelper @@ -89,25 +87,17 @@ Disabled _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 Level3 - ProgramDatabase - CompileAsC $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories) eglib.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def - true - Windows - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX86 %(AdditionalLibraryDirectories) @@ -122,21 +112,14 @@ Disabled _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 Level3 - ProgramDatabase - CompileAsC $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories) - $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def - true - Windows $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -146,28 +129,20 @@ - MinSpace 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) Level3 - ProgramDatabase - CompileAsC $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories) + true + true eglib.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def - true - Windows - true - true - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX86 %(AdditionalLibraryDirectories) @@ -179,24 +154,17 @@ X64 - MinSpace 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) Level3 - ProgramDatabase - CompileAsC $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories) + true + true - $(OutDir)$(TargetName)$(TargetExt) monoposixhelper.def - true - Windows - true - true $(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\$(TargetName).lib - MachineX64 eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -204,60 +172,12 @@ false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {158073ed-99ae-4196-9edc-ddb2344f8466} + diff --git a/msvc/monoposixhelper.vcxproj.filters b/msvc/monoposixhelper.vcxproj.filters index 9ca88289700..9d1aeac6764 100644 --- a/msvc/monoposixhelper.vcxproj.filters +++ b/msvc/monoposixhelper.vcxproj.filters @@ -1,135 +1,6 @@  - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - + {45dae598-72bc-4d0e-9cba-004f84c718c0} @@ -141,9 +12,4 @@ {2835d7d3-cd1c-4f3c-8783-d2413b0b1ae2} - - - Resource Files - - \ No newline at end of file diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index 5ffd5ac8af5..d491a5bd266 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -98,14 +96,9 @@ $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC 4018;4996;%(DisableSpecificWarnings) @@ -114,23 +107,20 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 - MinSpace WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) + true + true false @@ -138,14 +128,9 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - true - true - false - MachineX86 @@ -157,14 +142,9 @@ $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_WINDOWS;__WIN32__;HOST_WIN32;TARGET_WIN32;__i386__;TARGET_X86;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC 4018;4996;%(DisableSpecificWarnings) @@ -173,9 +153,7 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -183,13 +161,13 @@ X64 - MinSpace WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories) + true + true false @@ -197,28 +175,15 @@ $(MONO_STATIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {eb56000b-c80b-4e8b-908d-d84d31b517d3} - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d740} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {cb0d9e92-293c-439c-9ac7-c5f59b6e0772} diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index ec2f88f0dac..c16a2c30496 100644 --- a/msvc/profiler-vtune.vcxproj +++ b/msvc/profiler-vtune.vcxproj @@ -77,8 +77,6 @@ $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false - false mono-profiler-vtune$(MONO_TARGET_SUFFIX) mono-profiler-vtune$(MONO_TARGET_SUFFIX) mono-profiler-vtune$(MONO_TARGET_SUFFIX) @@ -86,22 +84,15 @@ - MaxSpeed true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true Level3 - ProgramDatabase $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + true - true - Windows - true - true - MachineX86 mono-profiler-vtune.def $(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies) $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) @@ -112,21 +103,15 @@ - MaxSpeed true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true Level3 - ProgramDatabase $(MONO_DIR);$(MONO_INCLUDE_DIR);$(MONO_LIBGC_INCLUDE_DIR);$(MONO_JIT_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR);$(VTUNE_INCLUDE_DIR);%(AdditionalIncludeDirectories) + true - true - Windows - true - true mono-profiler-vtune.def $(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies) $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) @@ -141,18 +126,13 @@ $(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 Level3 - ProgramDatabase $(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies) $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) - true - Windows - MachineX86 mono-profiler-vtune.def @@ -164,17 +144,13 @@ Disabled $(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 Level3 - ProgramDatabase $(MONO_LIBMONO_LIB);jitprofiling.lib;%(AdditionalDependencies) $(ProgramFiles)\Intel\VTune Amplifier XE 2013\lib32;%(AdditionalLibraryDirectories) - true - Windows mono-profiler-vtune.def @@ -188,20 +164,11 @@ - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {eb56000b-c80b-4e8b-908d-d84d31b517d3} - - - {c36612bd-22d3-4b95-85e2-7fdc4fc5d740} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} - + \ No newline at end of file diff --git a/msvc/test-invoke.vcxproj b/msvc/test-invoke.vcxproj index f258fb673c6..b753a04e32f 100644 --- a/msvc/test-invoke.vcxproj +++ b/msvc/test-invoke.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -98,14 +96,9 @@ $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC false @@ -113,38 +106,30 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - Console - false - MachineX86 + Console - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true - Console - true - true - false - MachineX86 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) + Console @@ -156,14 +141,9 @@ $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC false @@ -171,9 +151,7 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -181,36 +159,29 @@ X64 - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true - Console - true - true - MachineX64 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) + Console - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} diff --git a/msvc/test-metadata.vcxproj b/msvc/test-metadata.vcxproj index 810f82f82fa..6b6c771d3dd 100644 --- a/msvc/test-metadata.vcxproj +++ b/msvc/test-metadata.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -98,14 +96,9 @@ $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC false @@ -113,37 +106,29 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - false - MachineX86 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -156,14 +141,9 @@ $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC false @@ -171,9 +151,7 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -181,24 +159,20 @@ X64 - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -206,11 +180,8 @@ - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index 826b9b62633..7ee098d0174 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -1,4 +1,4 @@ - + @@ -88,12 +88,9 @@ $(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions) true - EnableFastChecks Level4 - false - ProgramDatabase false @@ -101,9 +98,6 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - false - false false @@ -111,14 +105,13 @@ - MinSpace $(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions) Level4 - false - ProgramDatabase + true + true false @@ -126,7 +119,6 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - false @@ -140,12 +132,9 @@ $(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions) true - EnableFastChecks Level4 - false - ProgramDatabase false @@ -153,10 +142,6 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true - false - false - MachineX64 @@ -164,14 +149,13 @@ X64 - MinSpace $(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions) Level4 - false - ProgramDatabase + true + true false @@ -179,7 +163,6 @@ eglib.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) - MachineX64 @@ -222,9 +205,6 @@ {158073ed-99ae-4196-9edc-ddb2344f8466} - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} - diff --git a/msvc/teste.vcxproj b/msvc/teste.vcxproj index 5fac6d8ac23..12be4cfb64f 100644 --- a/msvc/teste.vcxproj +++ b/msvc/teste.vcxproj @@ -72,13 +72,11 @@ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ true $(MONO_BUILD_DIR_PREFIX)$(Platform)\bin\$(Configuration)\ $(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)$(MONO_TARGET_SUFFIX)\$(Configuration)\ - false $(ProjectName)$(MONO_TARGET_SUFFIX) @@ -94,18 +92,13 @@ - Disabled $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC + Disabled + true false @@ -113,37 +106,29 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - false - MachineX86 - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - false - MachineX86 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -152,18 +137,13 @@ X64 - Disabled $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - $(IntDir) - $(IntDir) Level3 - ProgramDatabase - CompileAsC + Disabled + true false @@ -171,9 +151,7 @@ $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) %(AdditionalLibraryDirectories) - true Console - MachineX64 @@ -181,24 +159,20 @@ X64 - MinSpace WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level3 - ProgramDatabase $(MONO_DIR);$(SolutionDir)include;%(AdditionalIncludeDirectories) + true + true false %(AdditionalLibraryDirectories) - true Console - true - true - MachineX64 $(MONO_DYNAMIC_LIBMONO_LIB);%(AdditionalDependencies) @@ -206,11 +180,8 @@ - - {158073ed-99ae-4196-9edc-ddb2344f8466} - - - {cb0d9e92-293c-439c-9ac7-c5f59b6e0771} + + {675f4175-ffb1-480d-ad36-f397578844d4} -- 2.25.1