Don't add -MMD until we are just about ready to build the lib, it messes with

configure tests for RH's broken '2.96' compiler, and really doesn't belong
in CFLAGS before then anyway.

Made wxBaseArray dtor always non-virtual.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-11-18 02:11:19 +00:00
parent 9864c56ded
commit 88e30f2b71
3 changed files with 82 additions and 80 deletions

View File

@@ -3464,7 +3464,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then
PROFILE=" -pg"
fi
if test "$GCC" = yes ; then
if test "$GCC" = "yes" ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
fi
@@ -3474,10 +3474,6 @@ if test "$GCC" = yes ; then
if test "$wxUSE_PERMISSIVE" = "yes" ; then
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
if test "$wxUSE_NO_DEPS" = "no" ; then
CFLAGS="-MMD $CFLAGS"
CXXFLAGS="-MMD $CXXFLAGS"
fi
if test "$USE_WIN32" = 1 ; then
# I'm not even really sure what this was ever added to solve,
# but someone added it for mingw native builds, so I guess
@@ -4687,7 +4683,15 @@ if test "$GXX" = yes ; then
CXXWARNINGS="-Wall"
dnl should enable this one day...
dnl CXXWARNINGS="-Wall -Werror"
dnl Add this *after* all compile tests, we don't need or want generated
dnl depfiles until actually building the lib
if test "$wxUSE_NO_DEPS" = "no" ; then
CFLAGS="-MMD $CFLAGS"
CXXFLAGS="-MMD $CXXFLAGS"
fi
fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`