diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-07-30 15:37:50 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-11-08 23:22:05 +0100 |
| commit | 73bf608efc913589992903ebdbab1da5c115b49d (patch) | |
| tree | 8de0aa35aa82b40883c8d7f72aee21b612b3d31e /src/Volume | |
| parent | 6688c9d85a0a5aecca0b2de77fcf5ff7cf83dfba (diff) | |
| download | VeraCrypt-73bf608efc913589992903ebdbab1da5c115b49d.tar.gz VeraCrypt-73bf608efc913589992903ebdbab1da5c115b49d.zip | |
MacOSX : Correct issue of compiling assembly files in both 32-bit and 64-bit mode. Modify Makefiles to correct compilation process using latest Xcode.
Diffstat (limited to 'src/Volume')
| -rw-r--r-- | src/Volume/Volume.make | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make index 25c18441..212b1474 100644 --- a/src/Volume/Volume.make +++ b/src/Volume/Volume.make @@ -7,6 +7,7 @@ # OBJS := +OBJSEX := OBJS += Cipher.o OBJS += EncryptionAlgorithm.o OBJS += EncryptionMode.o @@ -24,12 +25,13 @@ OBJS += VolumeLayout.o OBJS += VolumePassword.o OBJS += VolumePasswordCache.o -ifeq "$(CPU_ARCH)" "x86" +ifeq "$(PLATFORM)" "MacOSX" + OBJSEX += ../Crypto/Aes_asm.oo + OBJS += ../Crypto/Aes_hw_cpu.o + OBJS += ../Crypto/Aescrypt.o +else ifeq "$(CPU_ARCH)" "x86" OBJS += ../Crypto/Aes_x86.o OBJS += ../Crypto/Aes_hw_cpu.o - ifeq "$(PLATFORM)" "MacOSX" - OBJS += ../Crypto/Aescrypt.o - endif else ifeq "$(CPU_ARCH)" "x64" OBJS += ../Crypto/Aes_x64.o OBJS += ../Crypto/Aes_hw_cpu.o @@ -53,4 +55,13 @@ OBJS += ../Common/SecurityToken.o VolumeLibrary: Volume.a +ifeq "$(PLATFORM)" "MacOSX" +../Crypto/Aes_asm.oo: ../Crypto/Aes_x86.asm ../Crypto/Aes_x64.asm + @echo Assembling $(<F) + $(AS) $(ASFLAGS) -f macho32 -o ../Crypto/Aes_x86.o ../Crypto/Aes_x86.asm + $(AS) $(ASFLAGS) -f macho64 -o ../Crypto/Aes_x64.o ../Crypto/Aes_x64.asm + lipo -create ../Crypto/Aes_x86.o ../Crypto/Aes_x64.o -output ../Crypto/Aes_asm.oo + rm -fr ../Crypto/Aes_x86.o ../Crypto/Aes_x64.o +endif + include $(BUILD_INC)/Makefile.inc |