-fpermissive is now returned by wx-config -cflags if the library was compiled
with it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2297,16 +2297,16 @@ if test "$wxUSE_PROFILE" = "yes" ; then
|
||||
fi
|
||||
|
||||
DEP_INFO_FLAGS=
|
||||
CODE_GEN_FLAGS=
|
||||
if test "$GCC" = yes ; then
|
||||
if test "$wxUSE_NO_RTTI" = "yes" ; then
|
||||
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
|
||||
fi
|
||||
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
|
||||
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
|
||||
fi
|
||||
if test "$wxUSE_PERMISSIVE" = "yes" ; then
|
||||
CFLAGS="${CFLAGS} -fpermissive"
|
||||
CXXFLAGS="${CXXFLAGS} -fpermissive"
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
|
||||
fi
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
DEP_INFO_FLAGS="-MMD"
|
||||
@@ -3196,6 +3196,7 @@ AC_SUBST(WX_ALL_INSTALLED)
|
||||
AC_SUBST(SHARED_LD)
|
||||
AC_SUBST(PIC_FLAG)
|
||||
AC_SUBST(DEP_INFO_FLAGS)
|
||||
AC_SUBST(CODE_GEN_FLAGS)
|
||||
AC_SUBST(BURNT_LIBRARY_NAME)
|
||||
|
||||
dnl debugging options
|
||||
|
@@ -65,8 +65,8 @@ SHARED_LD = @SHARED_LD@
|
||||
# We *must* include CPPFLAGS in both of these, to make sure that all
|
||||
# header files get found. (KB)
|
||||
|
||||
CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
|
||||
CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
|
||||
CFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
|
||||
CPPFLAGS = @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
|
||||
PICFLAGS = @PIC_FLAG@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
|
@@ -45,7 +45,7 @@ while test $# -gt 0; do
|
||||
fi
|
||||
fi
|
||||
includes="$includes -I@libdir@/wx/include"
|
||||
echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
|
||||
echo $includes @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
|
||||
;;
|
||||
--libs)
|
||||
if test @libdir@ != /usr/lib ; then
|
||||
|
Reference in New Issue
Block a user