aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/snippets
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2022-10-14 15:32:50 -0400
committerXavier Claessens <xclaesse@gmail.com>2022-10-24 14:52:13 +0200
commit942aea230f5e517d5add194240c8943f28d79943 (patch)
treeef4af65b83d089b084e8d051c53e46f0e47850fe /docs/markdown/snippets
parente04bce3f0453fc73c2170cfbf2f51debe2fc33c3 (diff)
downloadmeson-942aea230f5e517d5add194240c8943f28d79943.zip
meson-942aea230f5e517d5add194240c8943f28d79943.tar.gz
meson-942aea230f5e517d5add194240c8943f28d79943.tar.bz2
Add MASM compiler
ml and armasm are Microsoft's Macro Assembler, part of MSVC.
Diffstat (limited to 'docs/markdown/snippets')
-rw-r--r--docs/markdown/snippets/asm.md10
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/markdown/snippets/asm.md b/docs/markdown/snippets/asm.md
index a68f163..1055b53 100644
--- a/docs/markdown/snippets/asm.md
+++ b/docs/markdown/snippets/asm.md
@@ -1,11 +1,15 @@
-## New language `nasm`
+## New languages: `nasm` and `masm`
When the `nasm` language is added to the project, `.asm` files are
automatically compiled with NASM. This is only supported for x86 and x86_64 CPU
family. `yasm` is used as fallback if `nasm` command is not found.
-Note that GNU Assembly files usually have `.s` extension and were already built
-using C compiler such as GCC or CLANG.
+When the `masm` language is added to the project, `.masm` files are
+automatically compiled with Microsoft's Macro Assembler. This is only supported
+for x86, x86_64, ARM and AARCH64 CPU families.
+
+Note that GNU Assembly files usually have `.s` or `.S` extension and were already
+built using C compiler such as GCC or CLANG.
```meson
project('test', 'nasm')