diff options
| author | El Mostafa Idrassi <el-mostafa.idrassi@prestalab.net> | 2019-10-14 23:03:36 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-15 00:03:36 +0200 |
| commit | 67a514da6f3552fc075d9ae54557de4a752a7e47 (patch) | |
| tree | a43714f42043febc83d23a9482193081d3b893ba | |
| parent | bdcfe5bbb265934cd37d1b8d943be96e40c8b078 (diff) | |
| download | VeraCrypt-67a514da6f3552fc075d9ae54557de4a752a7e47.tar.gz VeraCrypt-67a514da6f3552fc075d9ae54557de4a752a7e47.zip | |
MacOSX: Enhanced Makefile and build script (#519)
Added new variable 'VC_OSX_SDK' to differentiate between the OSX minimum target and the SDK to use for building.
| -rwxr-xr-x | src/Build/build_veracrypt_macosx.sh | 14 | ||||
| -rw-r--r-- | src/Makefile | 13 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh index a28ba8de..70a94c4e 100755 --- a/src/Build/build_veracrypt_macosx.sh +++ b/src/Build/build_veracrypt_macosx.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2017 IDRIX +# Copyright (c) 2013-2019 IDRIX # Governed by the Apache License 2.0 the full text of which is contained # in the file License.txt included in VeraCrypt binary and source # code distribution packages. @@ -12,22 +12,22 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd) # directory where the VeraCrypt project has been checked out PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd) -# the sources of wxWidgets 3.1.2 must be extracted to the parent directory +# the sources of wxWidgets 3.1.2 must be extracted to the parent directory (for night mode) export WX_ROOT=$PARENTDIR/wxWidgets-3.1.2 echo "Using wxWidgets sources in $WX_ROOT" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.1.2 -# define the SDK version to use. We use 10.9 by default +# define the SDK version to use and OSX minimum target. We target 10.9 by default export VC_OSX_TARGET=10.9 -echo "Using MacOSX SDK $VC_OSX_TARGET" - +export VC_OSX_SDK=10.14 +echo "Using MacOSX SDK $VC_OSX_SDK" cd $SOURCEPATH echo "Building VeraCrypt" -# make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package +make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package # Uncomment below and comment line above to reuse existing wxWidgets build -make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
\ No newline at end of file +# make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package
\ No newline at end of file diff --git a/src/Makefile b/src/Makefile index b60ecfd9..fe0c143b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -242,11 +242,12 @@ ifeq "$(shell uname -s)" "Darwin" APPNAME := VeraCrypt export VC_OSX_TARGET ?= 10.7 + export VC_OSX_SDK ?= $(VC_OSX_TARGET) #check to see if XCode 3 path exists.Otherwise, use XCode 4 path - VC_OSX_SDK := /Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk - ifeq ($(wildcard $(VC_OSX_SDK)/SDKSettings.plist),) - VC_OSX_SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk + VC_OSX_SDK_PATH := /Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk + ifeq ($(wildcard $(VC_OSX_SDK_PATH)/SDKSettings.plist),) + VC_OSX_SDK_PATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk endif #----- Legacy build if OSX <= 10.8: we build both 32-bit and 64-bit ---- @@ -257,9 +258,9 @@ ifeq "$(shell uname -s)" "Darwin" CC := gcc CXX := g++ - C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(VC_OSX_SDK) - LFLAGS += -mmacosx-version-min=$(VC_OSX_TARGET) -Wl,-syslibroot $(VC_OSX_SDK) - WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK) + 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) + WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH) ifeq "$(CPU_ARCH)" "x64" CPU_ARCH = x86 |