Merge pull request #59 from gpongelli/config_options

Added configuration option variable.
This commit is contained in:
Felix Schulze 2015-08-13 07:34:25 +02:00
commit 93a510aee7

View File

@ -23,6 +23,7 @@
# #
VERSION="1.0.2d" # VERSION="1.0.2d" #
SDKVERSION=`xcrun -sdk iphoneos --show-sdk-version` # SDKVERSION=`xcrun -sdk iphoneos --show-sdk-version` #
CONFIG_OPTIONS=""
# # # #
########################################################################### ###########################################################################
# # # #
@ -103,10 +104,10 @@ do
set +e set +e
if [ "${ARCH}" == "x86_64" ]; then if [ "${ARCH}" == "x86_64" ]; then
./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 ./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${CONFIG_OPTIONS} > "${LOG}" 2>&1
else else
./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${CONFIG_OPTIONS} > "${LOG}" 2>&1
fi fi
if [ $? != 0 ]; if [ $? != 0 ];
then then
@ -119,8 +120,14 @@ do
if [ "$1" == "verbose" ]; if [ "$1" == "verbose" ];
then then
if [[ ! -z $CONFIG_OPTIONS ]]; then
make depend
fi
make make
else else
if [[ ! -z $CONFIG_OPTIONS ]]; then
make depend >> "${LOG}" 2>&1
fi
make >> "${LOG}" 2>&1 make >> "${LOG}" 2>&1
fi fi
@ -131,7 +138,7 @@ do
fi fi
set -e set -e
make install >> "${LOG}" 2>&1 make install_sw >> "${LOG}" 2>&1
make clean >> "${LOG}" 2>&1 make clean >> "${LOG}" 2>&1
done done