Makefiles now use CPPFLAGS in the same way as configure does.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -431,6 +431,15 @@ if test "$ac_cv_header_linux_joystick_h" = "yes"; then
|
||||
fi
|
||||
AC_SUBST(GTK_JOYSTICK)
|
||||
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_CHECK_HEADERS(iostream)
|
||||
if test "x$HAVE_IOSTREAM" = "x" ; then
|
||||
AC_DEFINE(wxUSE_IOSTREAMH)
|
||||
fi
|
||||
AC_LANG_RESTORE
|
||||
|
||||
dnl defines HAVE_IOSTREAM
|
||||
dnl ###################
|
||||
dnl # checks typedefs #
|
||||
dnl ###################
|
||||
|
@@ -31,12 +31,13 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
|
||||
|
||||
# c-compiler stuff
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
CPP = @CPP@
|
||||
CPPFLAGS=@CPPFLAGS@
|
||||
CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
|
||||
# c++-compiler stuff
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
|
||||
CXXCPP = @CXXCPP@
|
||||
|
||||
# shared compile stuff
|
||||
|
@@ -9,6 +9,7 @@ s|*OPTIMISE*|@OPTIMISE@|g
|
||||
s|*CC*|@CC@|g
|
||||
s|*CFLAGS*|@CFLAGS@|g
|
||||
s|*CPP*|@CPP@|g
|
||||
s|*CPPFLAGS*|@CPPFLAGS@|g
|
||||
s|*CXX*|@CXX@|g
|
||||
s|*CXXFLAGS*|@CXXFLAGS@|g
|
||||
s|*CXXCPP*|@CXXCPP@|g
|
||||
|
Reference in New Issue
Block a user