mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-22 00:00:06 +08:00
Squashed 'OpenVPN Adapter/Vendors/openvpn/' changes from da99df6..4095565
4095565 OpenVPN 3 client: added tun abstraction layer. 4bfaafc AsioTimer: use expires_after() method when possible. 782e8eb Apple: moved some source files. f89da96 OpenVPN 3 client: added single-thread mode: 233dfde OpenVPN 3 client: fixed state->session typos. d689b6d Added new Apple Core Foundation wrappers: 3838a62 i/o layer: added OPENVPN_IO_REQUIRES_STOP compile flag. 138ec96 asiopolysock.hpp: don't call SockOpt::set_cloexec(fd) if fd is undefined (i.e. fd == -1). 10eb723 Apple CF wrapper: renamed OWN/BORROW. 962fe87 Apple CF wrapper: simplify cf.hpp dependency profile. 4fcc99c Objective C++: fix symbol conflicts. 8f63cbb tunwrapasio.hpp: make generic with respect to i/o layer. 67e0013 AsioTimer: added expires_after() method. fc7eaaf Apple CF wrappers: moved CFRunLoop/CFRunLoopSource wrapper to applecrypto/cf, where all other CF wrappers currently reside. 1215912 Revamped Function (our own functor object) to be more flexible. 10fa276 process.hpp: added compile option to avoid async pipe usage. 9e09451 gwv4.hpp: added missing includes 916856d build script: updated Objective-C support when OBJC=1. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 4095565b4de2c7d738e728cae989f632100a8ce8
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user