diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-23 18:08:24 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-23 19:05:47 +0200 |
| commit | 52ec6faec3d20f23656f9ce603a72c7d2546bd33 (patch) | |
| tree | 8f5e86d2264559d01a8bc93d114d17342b81c320 /src/Build | |
| parent | f27b37b73f12bdebbc5bd8e3144c0ce44b91e5da (diff) | |
| download | VeraCrypt-52ec6faec3d20f23656f9ce603a72c7d2546bd33.tar.gz VeraCrypt-52ec6faec3d20f23656f9ce603a72c7d2546bd33.zip | |
Linux/MacOSX: use yasm instead of nasm for compiling all assembly files.
Diffstat (limited to 'src/Build')
| -rw-r--r-- | src/Build/Include/Makefile.inc | 4 | ||||
| -rwxr-xr-x | src/Build/Tools/MacOSX/nasm | bin | 1818752 -> 0 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Build/Include/Makefile.inc b/src/Build/Include/Makefile.inc index 9a38dcee..2e9e9b4f 100644 --- a/src/Build/Include/Makefile.inc +++ b/src/Build/Include/Makefile.inc @@ -31,8 +31,8 @@ clean: ifeq "$(PLATFORM)" "MacOSX" %.o: %.asm @echo Assembling $(<F) - $(AS) $(ASFLAGS) -f macho32 -o $@.32 $< - $(AS) $(ASFLAGS) -f macho64 -o $@.64 $< + $(AS) $(ASFLAGS32) -f macho32 -o $@.32 $< + $(AS) $(ASFLAGS64) -f macho64 -o $@.64 $< lipo -create $@.32 $@.64 -output $@ else %.o: %.asm diff --git a/src/Build/Tools/MacOSX/nasm b/src/Build/Tools/MacOSX/nasm Binary files differdeleted file mode 100755 index 7d2c38ac..00000000 --- a/src/Build/Tools/MacOSX/nasm +++ /dev/null |