disable wxSound for wxMGL DOS build (it's not implemented there)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
10
configure
vendored
10
configure
vendored
@@ -43337,8 +43337,16 @@ rm -f conftest.err conftest.$ac_objext \
|
|||||||
WITH_PLUGIN_SDL=1
|
WITH_PLUGIN_SDL=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
if test "$wxUSE_MGL" = 1; then
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5
|
||||||
|
echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;}
|
||||||
|
wxUSE_SOUND="no"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_SOUND" = "yes"; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define wxUSE_SOUND 1
|
#define wxUSE_SOUND 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -49767,7 +49775,7 @@ fi
|
|||||||
BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
|
BAKEFILE_BAKEFILE_M4_VERSION="0.2.0"
|
||||||
|
|
||||||
|
|
||||||
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0"
|
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.1"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -5662,8 +5662,16 @@ if test "$wxUSE_SOUND" = "yes"; then
|
|||||||
WITH_PLUGIN_SDL=1
|
WITH_PLUGIN_SDL=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
dnl wxMGL doesn't support sound under DOS, only under Unix
|
||||||
|
if test "$wxUSE_MGL" = 1; then
|
||||||
|
AC_MSG_WARN([wxSound not supported in MGL under DOS... disabled])
|
||||||
|
wxUSE_SOUND="no"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_SOUND" = "yes"; then
|
||||||
AC_DEFINE(wxUSE_SOUND)
|
AC_DEFINE(wxUSE_SOUND)
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user