diff --git a/dnSpy-Unity-mono-v2018.x.sln b/dnSpy-Unity-mono-v2018.x.sln index 557e8326f..8bacf8e44 100644 --- a/dnSpy-Unity-mono-v2018.x.sln +++ b/dnSpy-Unity-mono-v2018.x.sln @@ -548,6 +548,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgc", "unity-2018.4.15\ms EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "unity-2018.4.15\msvc\libmono.vcxproj", "{7B3D2EE6-6BE3-40B3-802B-9003FDA21568}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unity-2018.4.10", "unity-2018.4.10", "{2E161676-56E0-4469-8126-8BE1FD3AA000}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eglib", "unity-2018.4.10\msvc\eglib.vcxproj", "{B9344C71-7E23-4366-BDA7-21BCD0A80C5C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmdesc", "unity-2018.4.10\msvc\genmdesc.vcxproj", "{7699F8AD-00D5-447A-A782-97640C4EBD6E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgc", "unity-2018.4.10\msvc\libgc.vcxproj", "{EFAC5AA8-3936-4894-8AAF-8BF6714DB468}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono", "unity-2018.4.10\msvc\libmono.vcxproj", "{1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_eglib|x64 = Debug_eglib|x64 @@ -4882,6 +4892,86 @@ Global {7B3D2EE6-6BE3-40B3-802B-9003FDA21568}.Release|x64.Build.0 = Release|x64 {7B3D2EE6-6BE3-40B3-802B-9003FDA21568}.Release|x86.ActiveCfg = Release|Win32 {7B3D2EE6-6BE3-40B3-802B-9003FDA21568}.Release|x86.Build.0 = Release|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug_eglib|x64.Build.0 = Debug_eglib|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug_eglib|x86.ActiveCfg = Debug_eglib|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug_eglib|x86.Build.0 = Debug_eglib|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug|x64.ActiveCfg = Debug|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug|x64.Build.0 = Debug|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug|x86.ActiveCfg = Debug|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Debug|x86.Build.0 = Debug|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib_xarm|x64.ActiveCfg = Release_eglib_xarm|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib_xarm|x64.Build.0 = Release_eglib_xarm|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib_xarm|x86.ActiveCfg = Release_eglib_xarm|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib_xarm|x86.Build.0 = Release_eglib_xarm|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib|x64.ActiveCfg = Release_eglib|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib|x64.Build.0 = Release_eglib|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib|x86.ActiveCfg = Release_eglib|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release_eglib|x86.Build.0 = Release_eglib|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release|x64.ActiveCfg = Release|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release|x64.Build.0 = Release|x64 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release|x86.ActiveCfg = Release|Win32 + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C}.Release|x86.Build.0 = Release|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug_eglib|x64.Build.0 = Debug_eglib|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug_eglib|x86.ActiveCfg = Debug_eglib|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug_eglib|x86.Build.0 = Debug_eglib|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug|x64.ActiveCfg = Debug|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug|x64.Build.0 = Debug|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug|x86.ActiveCfg = Debug|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Debug|x86.Build.0 = Debug|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib_xarm|x64.ActiveCfg = Release_eglib_xarm|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib_xarm|x64.Build.0 = Release_eglib_xarm|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib_xarm|x86.ActiveCfg = Release_eglib_xarm|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib_xarm|x86.Build.0 = Release_eglib_xarm|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib|x64.ActiveCfg = Release_eglib|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib|x64.Build.0 = Release_eglib|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib|x86.ActiveCfg = Release_eglib|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release_eglib|x86.Build.0 = Release_eglib|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release|x64.ActiveCfg = Release|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release|x64.Build.0 = Release|x64 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release|x86.ActiveCfg = Release|Win32 + {7699F8AD-00D5-447A-A782-97640C4EBD6E}.Release|x86.Build.0 = Release|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug_eglib|x64.Build.0 = Debug_eglib|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug_eglib|x86.ActiveCfg = Debug_eglib|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug_eglib|x86.Build.0 = Debug_eglib|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug|x64.ActiveCfg = Debug|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug|x64.Build.0 = Debug|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug|x86.ActiveCfg = Debug|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Debug|x86.Build.0 = Debug|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib_xarm|x64.ActiveCfg = Release_eglib_xarm|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib_xarm|x64.Build.0 = Release_eglib_xarm|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib_xarm|x86.ActiveCfg = Release_eglib_xarm|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib_xarm|x86.Build.0 = Release_eglib_xarm|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib|x64.ActiveCfg = Release_eglib|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib|x64.Build.0 = Release_eglib|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib|x86.ActiveCfg = Release_eglib|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release_eglib|x86.Build.0 = Release_eglib|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release|x64.ActiveCfg = Release|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release|x64.Build.0 = Release|x64 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release|x86.ActiveCfg = Release|Win32 + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468}.Release|x86.Build.0 = Release|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug_eglib|x64.ActiveCfg = Debug_eglib|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug_eglib|x64.Build.0 = Debug_eglib|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug_eglib|x86.ActiveCfg = Debug_eglib|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug_eglib|x86.Build.0 = Debug_eglib|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug|x64.ActiveCfg = Debug|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug|x64.Build.0 = Debug|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug|x86.ActiveCfg = Debug|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Debug|x86.Build.0 = Debug|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib_xarm|x64.ActiveCfg = Release_eglib_xarm|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib_xarm|x64.Build.0 = Release_eglib_xarm|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib_xarm|x86.ActiveCfg = Release_eglib_xarm|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib_xarm|x86.Build.0 = Release_eglib_xarm|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib|x64.ActiveCfg = Release_eglib|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib|x64.Build.0 = Release_eglib|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib|x86.ActiveCfg = Release_eglib|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release_eglib|x86.Build.0 = Release_eglib|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release|x64.ActiveCfg = Release|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release|x64.Build.0 = Release|x64 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release|x86.ActiveCfg = Release|Win32 + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -5103,6 +5193,10 @@ Global {B5917EF2-8DF0-438D-A039-A2578296B0B9} = {C545BEB5-271C-4C8F-BD70-2E2DF72A2C11} {26898D46-8C39-4DFC-98BD-9FC8D24ECE7F} = {C545BEB5-271C-4C8F-BD70-2E2DF72A2C11} {7B3D2EE6-6BE3-40B3-802B-9003FDA21568} = {C545BEB5-271C-4C8F-BD70-2E2DF72A2C11} + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C} = {2E161676-56E0-4469-8126-8BE1FD3AA000} + {7699F8AD-00D5-447A-A782-97640C4EBD6E} = {2E161676-56E0-4469-8126-8BE1FD3AA000} + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468} = {2E161676-56E0-4469-8126-8BE1FD3AA000} + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064} = {2E161676-56E0-4469-8126-8BE1FD3AA000} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {22843117-1412-4A93-878D-A66FC9DAC383} diff --git a/unity-2018.4.10/mono/metadata/icall.c b/unity-2018.4.10/mono/metadata/icall.c index 79d35ea01..6e3fce51f 100644 --- a/unity-2018.4.10/mono/metadata/icall.c +++ b/unity-2018.4.10/mono/metadata/icall.c @@ -6825,9 +6825,13 @@ ves_icall_get_resources_ptr (MonoReflectionAssembly *assembly, gpointer *result, return TRUE; } +extern gboolean dnSpy_hideDebugger; + static MonoBoolean ves_icall_System_Diagnostics_Debugger_IsAttached_internal (void) { + if (dnSpy_hideDebugger) + return 0; return mono_debug_using_mono_debugger () || mono_is_debugger_attached (); } diff --git a/unity-2018.4.10/mono/mini/debugger-agent.c b/unity-2018.4.10/mono/mini/debugger-agent.c index 002d332e0..e200249bb 100644 --- a/unity-2018.4.10/mono/mini/debugger-agent.c +++ b/unity-2018.4.10/mono/mini/debugger-agent.c @@ -777,6 +777,7 @@ mono_debugger_agent_parse_options (char *options) agent_config.address = g_strdup_printf ("0.0.0.0:%u", 56000 + (GetCurrentProcessId () % 1000)); } } + } else if (dnSpy_debugger_agent_parse_options (arg)) { } else { print_usage (); exit (1); @@ -830,6 +831,8 @@ mono_debugger_agent_init (void) mono_profiler_install_jit_end (jit_end); mono_profiler_install_method_invoke (start_runtime_invoke, end_runtime_invoke); + dnSpy_debugger_init_after_agent (); + debugger_tls_id = TlsAlloc (); thread_to_tls = mono_g_hash_table_new (NULL, NULL); @@ -6803,7 +6806,8 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf) mono_loader_lock (); tls = mono_g_hash_table_lookup (thread_to_tls, thread); mono_loader_unlock (); - g_assert (tls); + if (!tls) + return ERR_INVALID_ARGUMENT; compute_frame_info (thread, tls); diff --git a/unity-2018.4.10/mono/mini/dnSpy.c b/unity-2018.4.10/mono/mini/dnSpy.c new file mode 100644 index 000000000..fd5388121 --- /dev/null +++ b/unity-2018.4.10/mono/mini/dnSpy.c @@ -0,0 +1,3 @@ +#include "debug-mini.h" +#include "debugger-agent.h" +#include "../dnSpyFiles/dnSpy.c" diff --git a/unity-2018.4.10/mono/mini/mini.c b/unity-2018.4.10/mono/mini/mini.c index 3e94ab5a5..77499e6a1 100644 --- a/unity-2018.4.10/mono/mini/mini.c +++ b/unity-2018.4.10/mono/mini/mini.c @@ -5323,6 +5323,8 @@ mini_init (const char *filename, const char *runtime_version) MONO_PROBE_VES_INIT_BEGIN (); + dnSpy_debugger_init (); + #ifdef __linux__ if (access ("/proc/self/maps", F_OK) != 0) { g_print ("Mono requires /proc to be mounted.\n"); diff --git a/unity-2018.4.10/mono/utils/mono-compiler.h b/unity-2018.4.10/mono/utils/mono-compiler.h index 3cbed14bb..46297092c 100644 --- a/unity-2018.4.10/mono/utils/mono-compiler.h +++ b/unity-2018.4.10/mono/utils/mono-compiler.h @@ -136,7 +136,7 @@ #include #define isnan(x) _isnan(x) -#define trunc(x) (((x) < 0) ? ceil((x)) : floor((x))) +//#define trunc(x) (((x) < 0) ? ceil((x)) : floor((x))) #define isinf(x) (_isnan(x) ? 0 : (_fpclass(x) == _FPCLASS_NINF) ? -1 : (_fpclass(x) == _FPCLASS_PINF) ? 1 : 0) #define isnormal(x) _finite(x) diff --git a/unity-2018.4.10/msvc/eglib.vcxproj b/unity-2018.4.10/msvc/eglib.vcxproj index b03fc602d..f275cec50 100644 --- a/unity-2018.4.10/msvc/eglib.vcxproj +++ b/unity-2018.4.10/msvc/eglib.vcxproj @@ -1,5 +1,5 @@  - + Debug_eglib @@ -43,56 +43,67 @@ - {158073ED-99AE-4196-9EDC-DDB2344F8466} + {B9344C71-7E23-4366-BDA7-21BCD0A80C5C} eglib Win32Proj + 10.0.16299.0 StaticLibrary Unicode true + v141 StaticLibrary Unicode true + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode true + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode true + v141 StaticLibrary Unicode true + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode true + v141 StaticLibrary Unicode + v141 @@ -165,7 +176,7 @@ Level4 - true + false EditAndContinue @@ -186,7 +197,7 @@ Level4 - true + false ProgramDatabase 4232;%(DisableSpecificWarnings) @@ -203,7 +214,7 @@ Level4 - true + false ProgramDatabase @@ -222,7 +233,7 @@ Level4 - true + false ProgramDatabase 4232;%(DisableSpecificWarnings) @@ -241,7 +252,7 @@ Level4 - true + false EditAndContinue @@ -262,7 +273,7 @@ Level4 - true + false ProgramDatabase 4232;%(DisableSpecificWarnings) @@ -279,7 +290,7 @@ Level4 - true + false ProgramDatabase @@ -298,7 +309,7 @@ Level4 - true + false ProgramDatabase 4232;%(DisableSpecificWarnings) @@ -315,7 +326,7 @@ Level4 - true + false ProgramDatabase @@ -334,7 +345,7 @@ Level4 - true + false ProgramDatabase 4232;%(DisableSpecificWarnings) diff --git a/unity-2018.4.10/msvc/genmdesc.vcxproj b/unity-2018.4.10/msvc/genmdesc.vcxproj index 5d7a2dd42..90a476dc9 100644 --- a/unity-2018.4.10/msvc/genmdesc.vcxproj +++ b/unity-2018.4.10/msvc/genmdesc.vcxproj @@ -1,5 +1,5 @@  - + Debug_eglib @@ -43,59 +43,70 @@ - {B7098DFA-31E6-4006-8A15-1C9A4E925149} + {7699F8AD-00D5-447A-A782-97640C4EBD6E} genmdesc + 10.0.16299.0 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 Application false Unicode + v141 @@ -792,7 +803,7 @@ - {158073ed-99ae-4196-9edc-ddb2344f8466} + {b9344c71-7e23-4366-bda7-21bcd0a80c5c} false diff --git a/unity-2018.4.10/msvc/libgc.vcxproj b/unity-2018.4.10/msvc/libgc.vcxproj index 28a51625b..cae3b5a01 100644 --- a/unity-2018.4.10/msvc/libgc.vcxproj +++ b/unity-2018.4.10/msvc/libgc.vcxproj @@ -1,5 +1,5 @@  - + Debug_eglib @@ -43,50 +43,61 @@ - {EB56000B-C80B-4E8B-908D-D84D31B517D3} + {EFAC5AA8-3936-4894-8AAF-8BF6714DB468} libgc Win32Proj + 10.0.16299.0 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 StaticLibrary Unicode + v141 diff --git a/unity-2018.4.10/msvc/libmono.vcxproj b/unity-2018.4.10/msvc/libmono.vcxproj index bdf45638e..eb68c8743 100644 --- a/unity-2018.4.10/msvc/libmono.vcxproj +++ b/unity-2018.4.10/msvc/libmono.vcxproj @@ -1,5 +1,5 @@  - + Debug_eglib @@ -43,59 +43,70 @@ - {CB0D9E92-293C-439C-9AC7-C5F59B6E0771} + {1BFF1DEA-AC65-4BE6-8C10-A14806EC8064} libmono + 10.0.16299.0 StaticLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 DynamicLibrary false Unicode + v141 @@ -133,27 +144,27 @@ <_ProjectFileVersion>10.0.40219.1 - ..\builds\embedruntimes\win32\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - $(Platform)_$(Configuration)/bin\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - ..\builds\embedruntimes\win32\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - $(Platform)_$(Configuration)/bin\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - ..\builds\embedruntimes\win32\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - ..\builds\embedruntimes\win64\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ false - ..\builds\embedruntimes\win32\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ - ..\builds\embedruntimes\win64\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)_$(Configuration)/obj/$(ProjectName)\ false - $(Platform)-$(Configuration)\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)-$(Configuration)\obj\$(ProjectName)\ - $(Platform)\$(Configuration)\ + ..\..\builds\$(Configuration)\unity-2018.4.10\win$(PlatformArchitecture)\ $(Platform)\$(Configuration)\ mono mono @@ -176,7 +187,7 @@ OnlyExplicitInline true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true @@ -221,7 +232,7 @@ OnlyExplicitInline true ..\libgc\include;..\;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) - NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true @@ -256,7 +267,7 @@ Default true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - _DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + _DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -264,7 +275,6 @@ - true ProgramDatabase CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -302,7 +312,7 @@ Default true ..\libgc\include;..\;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0;$(MONO_DEPENDENCIES_PREFIX)\include\glib-2.0\glib;$(MONO_DEPENDENCIES_PREFIX)\lib\glib-2.0\include;..\mono\;..\mono\jit;%(AdditionalIncludeDirectories) - _DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + _DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -310,7 +320,6 @@ - true ProgramDatabase CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -343,7 +352,7 @@ Default true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - TARGET_X86;_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + TARGET_X86;_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -351,7 +360,6 @@ - true ProgramDatabase CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -389,7 +397,7 @@ Default true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - _DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + _DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -397,7 +405,6 @@ - true ProgramDatabase CompileAsC 4996;4018;4244;%(DisableSpecificWarnings) @@ -430,14 +437,14 @@ OnlyExplicitInline true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true .\Release/libmono.pch - ProgramDatabase + None CompileAsC unity/libmono_vcdefs.h;%(ForcedIncludeFiles) @@ -453,7 +460,7 @@ $(OutDir)mono.dll $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) mono.def - true + false true true false @@ -475,7 +482,7 @@ OnlyExplicitInline true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true @@ -483,6 +490,7 @@ .\Release/libmono.pch CompileAsC + None NDEBUG;%(PreprocessorDefinitions) @@ -496,7 +504,7 @@ $(OutDir)mono.dll $(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories) mono.def - true + false $(Platform)_$(Configuration)/lib/$(TargetName).lib MachineX64 @@ -511,7 +519,7 @@ OnlyExplicitInline true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - NDEBUG;__i386__;TARGET_ARM;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__i386__;TARGET_ARM;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true @@ -540,7 +548,7 @@ OnlyExplicitInline true ..\libgc\include;..\;..\eglib\src;..\mono;%(AdditionalIncludeDirectories) - NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) + NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;PLATFORM_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;GC_NOT_DLL;HAVE_CONFIG_H;WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions) true MultiThreaded true @@ -679,28 +687,25 @@ + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -731,22 +736,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -777,22 +778,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -823,24 +820,20 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -868,23 +861,19 @@ %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -921,22 +910,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -967,22 +952,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1013,22 +994,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1059,22 +1036,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1108,22 +1081,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1155,22 +1124,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1202,22 +1167,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1250,22 +1211,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1297,22 +1254,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1343,22 +1296,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1389,22 +1338,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1435,22 +1380,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1481,22 +1422,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1529,22 +1466,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1578,22 +1511,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1624,22 +1553,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1670,22 +1595,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1716,22 +1637,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1762,22 +1679,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1808,22 +1721,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1854,22 +1763,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1900,22 +1805,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1946,22 +1847,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -1994,92 +1891,78 @@ $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2110,22 +1993,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2156,22 +2035,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2202,22 +2077,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2248,22 +2119,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2294,22 +2161,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2341,22 +2204,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2388,22 +2247,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2435,22 +2290,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2481,22 +2332,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2527,22 +2374,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2573,22 +2416,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2621,22 +2460,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2667,22 +2502,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2713,22 +2544,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2759,22 +2586,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2805,22 +2628,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2851,22 +2670,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2899,22 +2714,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2945,22 +2756,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -2991,22 +2798,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3037,22 +2840,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3083,22 +2882,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3129,22 +2924,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3175,22 +2966,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3221,22 +3008,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3267,22 +3050,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3313,22 +3092,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3360,22 +3135,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3406,22 +3177,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3455,22 +3222,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3501,22 +3264,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3548,22 +3307,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3594,22 +3349,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3641,22 +3392,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3687,22 +3434,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3733,22 +3476,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3782,22 +3521,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3829,22 +3564,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3877,22 +3608,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3923,22 +3650,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -3971,22 +3694,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -4018,22 +3737,18 @@ %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -4066,24 +3781,20 @@ %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -4118,24 +3829,20 @@ %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -4170,24 +3877,20 @@ %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - true true %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -4280,15 +3983,15 @@ - {158073ed-99ae-4196-9edc-ddb2344f8466} + {b9344c71-7e23-4366-bda7-21bcd0a80c5c} false - {b7098dfa-31e6-4006-8a15-1c9a4e925149} + {7699f8ad-00d5-447a-a782-97640c4ebd6e} false - {eb56000b-c80b-4e8b-908d-d84d31b517d3} + {efac5aa8-3936-4894-8aaf-8bf6714db468} false diff --git a/unity-2018.4.10/unity/unity_utils.c b/unity-2018.4.10/unity/unity_utils.c index 98da0a286..9a83c9b93 100644 --- a/unity-2018.4.10/unity/unity_utils.c +++ b/unity-2018.4.10/unity/unity_utils.c @@ -43,7 +43,7 @@ void unity_mono_redirect_output( HANDLE handle ) // int fd_copy; unity_log_output = handle; fd = _open_osfhandle((intptr_t)handle, (_O_APPEND | _O_TEXT)); - stdout->_file = fd; + //stdout->_file = fd; _dup2(fd,_fileno(stdout)); //*stdout = *_fdopen(fd, "at");