mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-19 19:52:15 +02:00
dco-win: remove ovpn-dco-win vcpkg dependency
uapi header has been added to the source code, so we don't need that dependency anymore. Fix MinGW script accordingly. Signed-off-by: Lev Stipakov <lev@openvpn.net>
This commit is contained in:
parent
56dcd976b1
commit
b7c6e2d5af
@ -127,15 +127,6 @@ build_tap_windows6()
|
||||
cp $DL/tap-windows6/src/tap-windows.h $DEP_DIR_PREFIX-$ARCH/include
|
||||
}
|
||||
|
||||
build_ovpn_dco_win()
|
||||
{
|
||||
ARCH=$1
|
||||
local DST_DIR="$DEP_DIR_PREFIX-$ARCH/include/ovpn-dco-win"
|
||||
|
||||
mkdir -p $DST_DIR
|
||||
cp $DL/ovpn-dco-win/uapi.h $DST_DIR/
|
||||
}
|
||||
|
||||
build_asio()
|
||||
{
|
||||
ARCH=$1
|
||||
@ -160,7 +151,6 @@ build_deps()
|
||||
build_lz4 $ARCH
|
||||
build_jsoncpp $ARCH
|
||||
build_tap_windows6 $ARCH
|
||||
build_ovpn_dco_win $ARCH
|
||||
build_asio $ARCH
|
||||
build_openssl $ARCH
|
||||
}
|
||||
@ -175,8 +165,7 @@ build_core()
|
||||
mkdir build-$ARCH
|
||||
|
||||
[ -z "$DCO" ] || {
|
||||
WITH_OVPNDCOWIN="-D CLI_OVPNDCOWIN=ON \
|
||||
-D OVPN_DCO_WIN_INCLUDE_DIRS=$DEP_DIR_PREFIX-$ARCH"
|
||||
WITH_OVPNDCOWIN="-D CLI_OVPNDCOWIN=ON"
|
||||
}
|
||||
|
||||
pushd build-$ARCH
|
||||
|
@ -46,13 +46,8 @@ if (WIN32)
|
||||
OVPNAGENT_DISABLE_PATH_CHECK)
|
||||
|
||||
if (${CLI_OVPNDCOWIN})
|
||||
find_path(OVPN_DCO_WIN_INCLUDE_DIRS "ovpn-dco-win/uapi.h")
|
||||
|
||||
target_compile_definitions(ovpncliagent PRIVATE ENABLE_OVPNDCOWIN)
|
||||
target_include_directories(ovpncliagent PRIVATE ${OVPN_DCO_WIN_INCLUDE_DIRS})
|
||||
|
||||
target_compile_definitions(ovpncli PRIVATE ENABLE_OVPNDCOWIN)
|
||||
target_include_directories(ovpncli PRIVATE ${OVPN_DCO_WIN_INCLUDE_DIRS})
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
|
@ -8,7 +8,6 @@
|
||||
"openssl",
|
||||
"jsoncpp",
|
||||
"asio",
|
||||
"tap-windows6",
|
||||
"ovpn-dco-win"
|
||||
"tap-windows6"
|
||||
]
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user