Merge commit '9b95600d069b5477fb0a091ffb9a51500c73c87d' into feature/update-dependencies

This commit is contained in:
Sergey Abramchuk
2017-04-15 11:59:39 +03:00
39 changed files with 773 additions and 223 deletions
@@ -292,13 +292,9 @@ fi
# Construct command
if [ "$OBJC" == "1" ]; then
FLAGS="$FLAGS -fobjc-arc"
CPPFLAGS=""
CPPFLAGS="$CPPFLAGS -I$O3/cliobjc"
CPPFLAGS="$CPPFLAGS -I$O3/clilib/dist-static-$PLATFORM/include"
LIBDIRS="-L$O3/clilib/dist-static-$PLATFORM/lib"
LIBS="-lovpncli -framework Foundation $LIBS"
SRC="$1.m $O3/cliobjc/ovpncli.mm "
CMD="$GPP_CMD $FLAGS $GCC_EXTRA $CPPFLAGS $LIBDIRS $SRC $EXTRA_SRC_OBJ $OUTPUT $LIBS"
LIBS="-framework Foundation $LIBS"
SRC="$1.mm"
CMD="$GPP_CMD $FLAGS $GCC_EXTRA $CPPFLAGS $LIBDIRS $SRC $EXTRA_CPP $EXTRA_SRC_OBJ $OUTPUT $LIBS"
else
CMD="$GPP_CMD $FLAGS $GCC_EXTRA $CPPFLAGS $LIBDIRS $1.cpp $EXTRA_CPP $EXTRA_SRC_OBJ $OUTPUT $LIBS"
fi