don't compile Scintilla sources with -Wall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
819d77af7c
commit
b1b592ad75
@ -489,7 +489,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
<lib-path>$(MGLLIBPATH)</lib-path>
|
||||
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
|
||||
</if>
|
||||
|
||||
<warnings>max</warnings>
|
||||
<cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
|
||||
<cppflags-watcom>
|
||||
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
|
||||
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
|
||||
|
@ -352,6 +352,7 @@ to run the tests, include CppUnit library here.
|
||||
<option name="EXTRALIBS_OPENGL"/>
|
||||
<option name="EXTRALIBS_SDL"/>
|
||||
<option name="EXTRALIBS_GNOMEPRINT"/>
|
||||
<option name="CXXWARNINGS"/>
|
||||
<option name="HOST_SUFFIX"/>
|
||||
<option name="SAMPLES_RPATH_FLAG"/>
|
||||
<option name="SAMPLES_RPATH_POSTLINK"/>
|
||||
|
13
configure
vendored
13
configure
vendored
@ -740,6 +740,7 @@ WX_LIB_FLAVOUR
|
||||
WXUNIV
|
||||
MONOLITHIC
|
||||
USE_PLUGINS
|
||||
CXXWARNINGS
|
||||
EXTRALIBS
|
||||
EXTRALIBS_XML
|
||||
EXTRALIBS_HTML
|
||||
@ -45405,7 +45406,7 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
|
||||
|
||||
C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
|
||||
CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
|
||||
CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS `
|
||||
CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
|
||||
|
||||
WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
|
||||
|
||||
@ -45544,6 +45545,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
|
||||
@ -49930,6 +49932,7 @@ WX_LIB_FLAVOUR!$WX_LIB_FLAVOUR$ac_delim
|
||||
WXUNIV!$WXUNIV$ac_delim
|
||||
MONOLITHIC!$MONOLITHIC$ac_delim
|
||||
USE_PLUGINS!$USE_PLUGINS$ac_delim
|
||||
CXXWARNINGS!$CXXWARNINGS$ac_delim
|
||||
EXTRALIBS!$EXTRALIBS$ac_delim
|
||||
EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
|
||||
EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
|
||||
@ -49999,7 +50002,6 @@ COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_deli
|
||||
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
||||
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
|
||||
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
|
||||
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -50041,6 +50043,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
|
||||
COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
|
||||
COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
|
||||
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
|
||||
@ -50137,7 +50140,6 @@ COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
|
||||
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -50179,6 +50181,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
|
||||
@ -50275,7 +50278,6 @@ SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
|
||||
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
|
||||
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
|
||||
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
|
||||
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -50317,6 +50319,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
|
||||
RESCOMP!$RESCOMP$ac_delim
|
||||
RESFLAGS!$RESFLAGS$ac_delim
|
||||
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
|
||||
@ -50331,7 +50334,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
@ -7593,7 +7593,7 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
|
||||
|
||||
C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
|
||||
CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
|
||||
CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS `
|
||||
CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
|
||||
|
||||
dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config
|
||||
dnl only stuff to it
|
||||
@ -7725,6 +7725,7 @@ AC_SUBST(WXUNIV)
|
||||
AC_SUBST(MONOLITHIC)
|
||||
AC_SUBST(USE_PLUGINS)
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(CXXWARNINGS)
|
||||
AC_SUBST(EXTRALIBS)
|
||||
AC_SUBST(EXTRALIBS_XML)
|
||||
AC_SUBST(EXTRALIBS_HTML)
|
||||
|
Loading…
Reference in New Issue
Block a user