removed -Icontrib from src/make.env, use APPEXTRADEFS for such things instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
aaa2f29761
commit
8461a0598c
2
configure
vendored
2
configure
vendored
@ -13731,7 +13731,7 @@ fi
|
||||
|
||||
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
|
||||
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include -I\${top_srcdir}/contrib/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
|
||||
|
||||
if test "$GXX" = yes ; then
|
||||
CXXWARNINGS="-Wall"
|
||||
|
@ -3534,7 +3534,7 @@ dnl makefile system without libtool
|
||||
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
|
||||
|
||||
dnl all -I options we must pass to the compiler
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include -I\${top_srcdir}/contrib/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
|
||||
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
|
||||
|
||||
dnl C/C++ compiler options used to compile wxWindows
|
||||
if test "$GXX" = yes ; then
|
||||
|
@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
|
||||
WXLIB = @WX_LIBRARY_NAME_STATIC@
|
||||
WXSHLIB = @WX_LIBRARY_NAME_SHARED@
|
||||
|
||||
EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
|
||||
EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" $(APPEXTRADEFS)
|
||||
|
||||
########################### VERSION #################################
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user