Skip to content

Commit

Permalink
meson: drop --with-win-sdk
Browse files Browse the repository at this point in the history
It's no longer used.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
elmarco authored and bonzini committed Feb 16, 2022
1 parent 66d201e commit bd4b3df
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 34 deletions.
29 changes: 0 additions & 29 deletions configure
Expand Up @@ -318,7 +318,6 @@ trace_backends="log"
trace_file="trace"
opengl="$default_feature"
vss_win32_sdk="$default_feature"
win_sdk="no"
coroutine=""
tls_priority="NORMAL"
plugins="$default_feature"
Expand Down Expand Up @@ -964,12 +963,6 @@ for opt do
;;
--without-vss-sdk) vss_win32_sdk="no"
;;
--with-win-sdk) win_sdk=""
;;
--with-win-sdk=*) win_sdk="$optarg"
;;
--without-win-sdk) win_sdk="no"
;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
Expand Down Expand Up @@ -2353,27 +2346,6 @@ EOF
fi
fi

##########################################
# lookup Windows platform SDK (if not specified)
# The SDK is needed only to build .tlb (type library) file of guest agent
# VSS provider from the source. It is usually unnecessary because the
# pre-compiled .tlb file is included.

if test "$mingw32" = "yes" && \
test "$guest_agent_with_vss" = "yes" ; then
if test -z "$win_sdk"; then
programfiles="$PROGRAMFILES"
test -n "$PROGRAMW6432" && programfiles="$PROGRAMW6432"
if test -n "$programfiles"; then
win_sdk=$(ls -d "$programfiles/Microsoft SDKs/Windows/v"* | tail -1) 2>/dev/null
else
feature_not_found "Windows SDK"
fi
elif test "$win_sdk" = "no"; then
win_sdk=""
fi
fi

##########################################
# check if mingw environment provides a recent ntddscsi.h
guest_agent_ntddscsi="no"
Expand Down Expand Up @@ -2905,7 +2877,6 @@ if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi
if test "$guest_agent_ntddscsi" = "yes" ; then
echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
Expand Down
5 changes: 0 additions & 5 deletions meson.build
Expand Up @@ -3403,11 +3403,6 @@ endif
if targetos == 'darwin'
summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
endif
if targetos == 'windows'
if 'WIN_SDK' in config_host
summary_info += {'Windows SDK': config_host['WIN_SDK']}
endif
endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+ ['-O' + get_option('optimization')]
+ (get_option('debug') ? ['-g'] : []))}
Expand Down

0 comments on commit bd4b3df

Please sign in to comment.