nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-24 20:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

MacOSX: Enhanced Makefile and build script (#519)

Browse Source 
Added new variable 'VC_OSX_SDK' to differentiate between the OSX minimum target and the SDK to use for building.
This commit is contained in:
El Mostafa Idrassi 2019-10-14 23:03:36 +01:00 committed by Mounir IDRASSI
parent bdcfe5bbb2
commit 67a514da6f
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Build/build_veracrypt_macosx.sh
View File

@ -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 # 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 # in the file License.txt included in VeraCrypt binary and source
# code distribution packages. # code distribution packages.
@ -12,22 +12,22 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd)
# directory where the VeraCrypt project has been checked out # directory where the VeraCrypt project has been checked out
PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd) 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 export WX_ROOT=$PARENTDIR/wxWidgets-3.1.2
echo "Using wxWidgets sources in $WX_ROOT" echo "Using wxWidgets sources in $WX_ROOT"
# this will be the temporary wxWidgets directory # this will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.1.2 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 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 cd $SOURCEPATH
echo "Building VeraCrypt" 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 # Uncomment below and comment line above to reuse existing wxWidgets build
make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package # make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package

13
src/Makefile
View File

@ -242,11 +242,12 @@ ifeq "$(shell uname -s)" "Darwin"
APPNAME := VeraCrypt APPNAME := VeraCrypt
export VC_OSX_TARGET ?= 10.7 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 #check to see if XCode 3 path exists.Otherwise, use XCode 4 path
VC_OSX_SDK := /Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk VC_OSX_SDK_PATH := /Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk
ifeq ($(wildcard $(VC_OSX_SDK)/SDKSettings.plist),) ifeq ($(wildcard $(VC_OSX_SDK_PATH)/SDKSettings.plist),)
VC_OSX_SDK := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_TARGET).sdk VC_OSX_SDK_PATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VC_OSX_SDK).sdk
endif endif
#----- Legacy build if OSX <= 10.8: we build both 32-bit and 64-bit ---- #----- 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 CC := gcc
CXX := g++ CXX := g++
C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_MACOSX -mmacosx-version-min=$(VC_OSX_TARGET) -isysroot $(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) 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) WX_CONFIGURE_FLAGS += --with-macosx-version-min=$(VC_OSX_TARGET) --with-macosx-sdk=$(VC_OSX_SDK_PATH)
ifeq "$(CPU_ARCH)" "x64" ifeq "$(CPU_ARCH)" "x64"
CPU_ARCH = x86 CPU_ARCH = x86