extracted MSW-specific setup.h options to their own wx/msw/setup_inc.h file which is now used to automaitcally generate both wx/msw/setup0.h and setup.h.in by update-setup-h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
61
configure
vendored
61
configure
vendored
@@ -1848,6 +1848,7 @@ Optional Features:
|
||||
--enable-icocur use Windows ICO and CUR formats
|
||||
--enable-dccache cache temporary wxDC objects (Win32 only)
|
||||
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
|
||||
--enable-wxdib compile wxDIB class (Win32 only)
|
||||
--disable-largefile omit support for large files
|
||||
--disable-gtktest do not try to compile and run a test GTK+ program
|
||||
--disable-gtktest Do not try to compile and run a test GTK program
|
||||
@@ -15345,6 +15346,59 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6; }
|
||||
# Check whether --enable-wxdib was given.
|
||||
if test "${enable_wxdib+set}" = set; then
|
||||
enableval=$enable_wxdib;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_wxdib='wxUSE_DIB=yes'
|
||||
else
|
||||
wx_cv_use_wxdib='wxUSE_DIB=no'
|
||||
fi
|
||||
cache=yes
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
fi
|
||||
|
||||
wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_wxdib"
|
||||
if test "x$cache" = xyes; then
|
||||
echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_DIB = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_DIB
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@@ -48536,6 +48590,13 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DIB" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_WXDIB 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user