nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-27 21:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

MacOSX: Fix whitespaces by using tabs in Makefile

Browse Source
This commit is contained in:
Mounir IDRASSI 2024-06-16 15:50:59 +02:00
parent e4e83d30c1
commit 8b73ccd07a
No known key found for this signature in database
GPG Key ID: C2FF2438CD26E3B7
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Makefile
View File

@ -321,14 +321,14 @@ ifeq "$(shell uname -s)" "Darwin"
# To suppress this warning, we need to use -Wl,-ld_classic flag in order to use the old ld64 linker # To suppress this warning, we need to use -Wl,-ld_classic flag in order to use the old ld64 linker
# https://mjtsai.com/blog/2024/03/15/xcode-15-no-platform-load-command-found/ # https://mjtsai.com/blog/2024/03/15/xcode-15-no-platform-load-command-found/
# Check Xcode version for using specific linker flag # Check Xcode version for using specific linker flag
XCODE_VERSION := $(shell xcodebuild -version 2>/dev/null | grep 'Xcode' | sed -E 's/Xcode ([0-9]+).*/\1/') XCODE_VERSION := $(shell xcodebuild -version 2>/dev/null | grep 'Xcode' | sed -E 's/Xcode ([0-9]+).*/\1/')
ifneq ($(XCODE_VERSION),) ifneq ($(XCODE_VERSION),)
ifeq "$(shell expr $(XCODE_VERSION) \>= 15)" "1" ifeq "$(shell expr $(XCODE_VERSION) \>= 15)" "1"
LFLAGS += -Wl,-ld_classic LFLAGS += -Wl,-ld_classic
endif endif
else else
$(error Xcode not found, please check your installation) $(error Xcode not found, please check your installation)
endif endif
WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH) WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH)
@ -336,22 +336,22 @@ ifeq "$(shell uname -s)" "Darwin"
# Set x86 assembly flags (-msse2, -mssse3, -msse4.1) # Set x86 assembly flags (-msse2, -mssse3, -msse4.1)
# Apply flags if SIMD_SUPPORTED is 1 or if not in local development build (we are creating universal binary in this case) # Apply flags if SIMD_SUPPORTED is 1 or if not in local development build (we are creating universal binary in this case)
ifneq "$(LOCAL_DEVELOPMENT_BUILD)" "true" ifneq "$(LOCAL_DEVELOPMENT_BUILD)" "true"
SIMD_SUPPORTED = 1 SIMD_SUPPORTED = 1
endif endif
ifeq "$(SIMD_SUPPORTED)" "1" ifeq "$(SIMD_SUPPORTED)" "1"
CFLAGS += -msse2 CFLAGS += -msse2
CXXFLAGS += -msse2 CXXFLAGS += -msse2
ifeq "$(origin SSSE3)" "command line" ifeq "$(origin SSSE3)" "command line"
CFLAGS += -mssse3 CFLAGS += -mssse3
CXXFLAGS += -mssse3 CXXFLAGS += -mssse3
endif endif
ifeq "$(origin SSE41)" "command line" ifeq "$(origin SSE41)" "command line"
CFLAGS += -mssse3 -msse4.1 CFLAGS += -mssse3 -msse4.1
CXXFLAGS += -mssse3 -msse4.1 CXXFLAGS += -mssse3 -msse4.1
endif endif
endif endif
AS ?= $(BASE_DIR)/Build/Tools/MacOSX/yasm AS ?= $(BASE_DIR)/Build/Tools/MacOSX/yasm
@ -362,19 +362,19 @@ ifeq "$(shell uname -s)" "Darwin"
export DISABLE_PRECOMPILED_HEADERS := 1 export DISABLE_PRECOMPILED_HEADERS := 1
C_CXX_FLAGS := $(subst -MMD,,$(C_CXX_FLAGS)) -gfull C_CXX_FLAGS := $(subst -MMD,,$(C_CXX_FLAGS)) -gfull
LFLAGS += -Wl,-dead_strip LFLAGS += -Wl,-dead_strip
# Initialize architecture flag # Initialize architecture flag
ARCH_FLAG := -arch x86_64 ARCH_FLAG := -arch x86_64
# Set architecture flags based on build type and CPU architecture # Set architecture flags based on build type and CPU architecture
ifeq "$(LOCAL_DEVELOPMENT_BUILD)" "true" ifeq "$(LOCAL_DEVELOPMENT_BUILD)" "true"
ifeq "$(CPU_ARCH)" "arm64" ifeq "$(CPU_ARCH)" "arm64"
ARCH_FLAG := -arch arm64 ARCH_FLAG := -arch arm64
endif endif
WX_CONFIGURE_FLAGS += --disable-universal_binary WX_CONFIGURE_FLAGS += --disable-universal_binary
else else
# Legacy build settings # Legacy build settings
ifdef VC_LEGACY_BUILD ifdef VC_LEGACY_BUILD
ARCH_FLAG += -arch i386 ARCH_FLAG += -arch i386