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

MacOSX: Fix compilation error in build configurations other than official release

Browse Source
This commit is contained in:
Mounir IDRASSI 2024-06-21 09:48:18 +02:00
parent c370d4887c
commit 8b01b533cf
No known key found for this signature in database
GPG Key ID: C2FF2438CD26E3B7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -315,6 +315,7 @@ ifeq "$(shell uname -s)" "Darwin"
GCC_GTEQ_430 := 1 GCC_GTEQ_430 := 1
CXXFLAGS += -std=c++11
C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(VC_OSX_SDK_PATH) C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(VC_OSX_SDK_PATH)
LFLAGS += -mmacosx-version-min=$(VC_OSX_TARGET) -Wl,-syslibroot $(VC_OSX_SDK_PATH) LFLAGS += -mmacosx-version-min=$(VC_OSX_TARGET) -Wl,-syslibroot $(VC_OSX_SDK_PATH)
#Xcode 15 linker emits a warning "no platform load command found" when linking object files generated by yasm #Xcode 15 linker emits a warning "no platform load command found" when linking object files generated by yasm
@ -380,7 +381,6 @@ ifeq "$(shell uname -s)" "Darwin"
ARCH_FLAG += -arch i386 ARCH_FLAG += -arch i386
WX_CONFIGURE_FLAGS += --enable-universal_binary=i386,x86_64 WX_CONFIGURE_FLAGS += --enable-universal_binary=i386,x86_64
else else
CXXFLAGS += -std=c++11
# Non-development build defaults to universal binary for arm64 and x86_64 # Non-development build defaults to universal binary for arm64 and x86_64
ARCH_FLAG += -arch arm64 ARCH_FLAG += -arch arm64
WX_CONFIGURE_FLAGS += --enable-universal_binary=arm64,x86_64 WX_CONFIGURE_FLAGS += --enable-universal_binary=arm64,x86_64