From: lateralusX Date: Thu, 28 Sep 2017 09:23:27 +0000 (+0200) Subject: Fix libmini targets and filters. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=6cb544f91d0c062a5450cd1b83c76f4575e48bf2 Fix libmini targets and filters. --- diff --git a/mono/mini/aot-runtime-wasm.c b/mono/mini/aot-runtime-wasm.c index b5328ffc99d..f50c59da142 100644 --- a/mono/mini/aot-runtime-wasm.c +++ b/mono/mini/aot-runtime-wasm.c @@ -438,4 +438,8 @@ mono_aot_get_trampoline_full (const char *name, MonoTrampInfo **out_tinfo) return code; } -#endif +#else /* TARGET_WASM */ + +MONO_EMPTY_SOURCE_FILE (aot_runtime_wasm); + +#endif /* TARGET_WASM */ diff --git a/msvc/libmini-arch.targets b/msvc/libmini-arch.targets new file mode 100644 index 00000000000..24fc1aadfa0 --- /dev/null +++ b/msvc/libmini-arch.targets @@ -0,0 +1,231 @@ + + + + + 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 + + + + 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 + + + + 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-arch.targets.filters b/msvc/libmini-arch.targets.filters new file mode 100644 index 00000000000..901fb3c6f13 --- /dev/null +++ b/msvc/libmini-arch.targets.filters @@ -0,0 +1,242 @@ + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\wasm + + + Header Files$(MonoMiniFilterSubFolder)\arch\wasm + + + Source Files$(MonoMiniFilterSubFolder)\arch\wasm + + + Source Files$(MonoMiniFilterSubFolder)\arch\wasm + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\x86 + + + Header Files$(MonoMiniFilterSubFolder)\arch\x86 + + + Source Files$(MonoMiniFilterSubFolder)\arch\x86 + + + Source Files$(MonoMiniFilterSubFolder)\arch\x86 + + + Source Files$(MonoMiniFilterSubFolder)\arch\x86 + + + Source Files$(MonoMiniFilterSubFolder)\arch\x86 + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Header Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Header Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\amd64 + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\ppc + + + Header Files$(MonoMiniFilterSubFolder)\arch\ppc + + + Source Files$(MonoMiniFilterSubFolder)\arch\ppc + + + Source Files$(MonoMiniFilterSubFolder)\arch\ppc + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm + + + Header Files$(MonoMiniFilterSubFolder)\arch\arm + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Header Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Header Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + Source Files$(MonoMiniFilterSubFolder)\arch\arm64 + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\mips + + + Header Files$(MonoMiniFilterSubFolder)\arch\mips + + + Source Files$(MonoMiniFilterSubFolder)\arch\mips + + + Source Files$(MonoMiniFilterSubFolder)\arch\mips + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\sparc + + + Header Files$(MonoMiniFilterSubFolder)\arch\sparc + + + Source Files$(MonoMiniFilterSubFolder)\arch\sparc + + + Source Files$(MonoMiniFilterSubFolder)\arch\sparc + + + + + Source Files$(MonoMiniFilterSubFolder)\arch\s390x + + + Header Files$(MonoMiniFilterSubFolder)\arch\s390x + + + Header Files$(MonoMiniFilterSubFolder)\arch\s390x + + + Source Files$(MonoMiniFilterSubFolder)\arch\s390x + + + Source Files$(MonoMiniFilterSubFolder)\arch\s390x + + + + + {819510FE-1354-40D8-93CA-2FF5EB410FED} + + + {9FD04D2D-B4F4-4EC6-82FF-26A2333D4467} + + + + + {B6D0ED07-1561-4C73-97E6-3E0688E3FDB3} + + + {1EBAD4C5-455D-425F-B036-9D31C3A1D5B5} + + + + + {4F64FA1A-0E4D-46ED-97DE-6913D02E6210} + + + {195D3978-2A6F-4319-8E1C-D0DB1210F6B2} + + + + + {257C0357-BA3E-4E1C-9C35-466AB8436E8C} + + + {54DD5925-EFC1-4795-A72F-567572A55127} + + + + + {93654968-5AC2-47D6-B75A-2B2B389E755F} + + + {BC2E6DB6-BE05-4CA1-8B7A-C6E479CF18B8} + + + + + {AD618FB9-5A86-4FB0-8954-D521472E4ABA} + + + {BEB75A74-7D5B-46FF-A3C8-54CD43CB3169} + + + + + {215EE8BC-34C7-443B-913D-6C66A12D5423} + + + {62141C1C-2506-47B6-87FC-A5BEC57E25C4} + + + + + {EAD92105-5ECB-4307-B7B1-E46505F8F663} + + + {36B76A9F-133A-4A05-BB24-8AF688194DF2} + + + + + {9388C690-91E7-4FA1-86EE-FF8D2B146B23} + + + {271C5D45-30DD-490B-B8F1-00BB955EAF71} + + + + + {E241E01E-29A9-4029-AD16-7A9E33B3153C} + + + {906B3D7C-D6B7-4EA6-A2B5-2B385C9C2A6C} + + + diff --git a/msvc/libmini-common.targets b/msvc/libmini-common.targets new file mode 100644 index 00000000000..b201a6a1176 --- /dev/null +++ b/msvc/libmini-common.targets @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc/libmini-common.targets.filters b/msvc/libmini-common.targets.filters new file mode 100644 index 00000000000..3d27a2447cf --- /dev/null +++ b/msvc/libmini-common.targets.filters @@ -0,0 +1,228 @@ + + + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Header Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + Source Files$(MonoMiniFilterSubFolder)\common + + + + + Resource Files$(MonoMiniFilterSubFolder)\common + + + + + {5E1443AF-3832-4C37-AD99-0D264DE68344} + + + {D09DBA53-D0BA-4E90-B207-4B23A9E7709B} + + + {C0C82F0C-77A6-447F-BED2-39FD6ACDDC3A} + + + diff --git a/msvc/libmini-interp.targets b/msvc/libmini-interp.targets new file mode 100644 index 00000000000..a3b0e63b84a --- /dev/null +++ b/msvc/libmini-interp.targets @@ -0,0 +1,29 @@ + + + + + + + + true + true + true + true + + + + + + true + true + true + true + + + true + true + true + true + + + diff --git a/msvc/libmini-interp.targets.filters b/msvc/libmini-interp.targets.filters new file mode 100644 index 00000000000..afe32ef5f94 --- /dev/null +++ b/msvc/libmini-interp.targets.filters @@ -0,0 +1,43 @@ + + + + + Header Files$(MonoMiniFilterSubFolder)\interp + + + Header Files$(MonoMiniFilterSubFolder)\interp + + + Header Files$(MonoMiniFilterSubFolder)\interp + + + Source Files$(MonoMiniFilterSubFolder)\interp + + + Source Files$(MonoMiniFilterSubFolder)\interp + + + Header Files$(MonoMiniFilterSubFolder)\interp + + + Resource Files$(MonoMiniFilterSubFolder)\interp + + + Source Files$(MonoMiniFilterSubFolder)\interp + + + Source Files$(MonoMiniFilterSubFolder)\interp + + + + + {9E07C63F-9DE3-45EC-AEF6-D55AE5E7B644} + + + {1064DAD3-1B4C-4803-BD5F-D046F98052E4} + + + {5D14595A-15DA-44C8-AC7D-3B296DBC324D} + + + diff --git a/msvc/libmini-llvm.targets b/msvc/libmini-llvm.targets new file mode 100644 index 00000000000..432b99c24b7 --- /dev/null +++ b/msvc/libmini-llvm.targets @@ -0,0 +1,35 @@ + + + + + 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-llvm.targets.filters b/msvc/libmini-llvm.targets.filters new file mode 100644 index 00000000000..8bbf1212af1 --- /dev/null +++ b/msvc/libmini-llvm.targets.filters @@ -0,0 +1,25 @@ + + + + + Source Files$(MonoMiniFilterSubFolder)\llvm + + + Source Files$(MonoMiniFilterSubFolder)\llvm + + + Source Files$(MonoMiniFilterSubFolder)\llvm + + + Source Files$(MonoMiniFilterSubFolder)\llvm + + + Source Files$(MonoMiniFilterSubFolder)\llvm + + + + + {6FF52301-18F4-41A3-AF3B-6D129E50D8AB} + + + diff --git a/msvc/libmini-posix.targets b/msvc/libmini-posix.targets new file mode 100644 index 00000000000..39b348a29ef --- /dev/null +++ b/msvc/libmini-posix.targets @@ -0,0 +1,19 @@ + + + + + true + true + true + true + + + + + true + true + true + true + + + diff --git a/msvc/libmini-posix.targets.filters b/msvc/libmini-posix.targets.filters new file mode 100644 index 00000000000..02db2ec9a95 --- /dev/null +++ b/msvc/libmini-posix.targets.filters @@ -0,0 +1,21 @@ + + + + + Source Files$(MonoMiniFilterSubFolder)\darwin + + + + + Source Files$(MonoMiniFilterSubFolder)\posix + + + + + {E3BEC2F7-4DE6-43BC-A38D-67414D6CAB8B} + + + {B80745E3-E5F0-47A7-BE31-CBEC8615EDFE} + + + diff --git a/msvc/libmini-win32.targets b/msvc/libmini-win32.targets new file mode 100644 index 00000000000..33639ac2426 --- /dev/null +++ b/msvc/libmini-win32.targets @@ -0,0 +1,7 @@ + + + + + + + diff --git a/msvc/libmini-win32.targets.filters b/msvc/libmini-win32.targets.filters new file mode 100644 index 00000000000..d7b6f8f4856 --- /dev/null +++ b/msvc/libmini-win32.targets.filters @@ -0,0 +1,19 @@ + + + + + Source Files$(MonoMiniFilterSubFolder)\win32 + + + Header Files$(MonoMiniFilterSubFolder)\win32 + + + + + {B67D965A-45EE-4B01-AE98-CC6470F6DC9E} + + + {2F0E3758-B8D9-4009-8B48-47F48303D00E} + + + diff --git a/msvc/libmini.targets b/msvc/libmini.targets index 50ebafb980b..999a576a629 100644 --- a/msvc/libmini.targets +++ b/msvc/libmini.targets @@ -1,137 +1,9 @@ - - - - - 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 index 87f8e5e3df7..467de8a12af 100644 --- a/msvc/libmini.targets.filters +++ b/msvc/libmini.targets.filters @@ -1,254 +1,11 @@ - - - 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}