Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take -DWX_PRECOMP out of GCC_PRAGMA_FLAGS and put it into its own PCH_FLAGS.

Browse Source 
If -DNO_GCC_PRAGMA is included in GCC_PRAGMA_FLAGS (because the platform
always requires it) then it won't be duplicated in PCH_FLAGS, but if
the platform does not normally need -DNO_GCC_PRAGMA then the flag
will be included in PCH_FLAGS because PCH always requires it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-01-18 21:22:42 +00:00
parent bdbb07ede3
commit d20834167e
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@@ -40202,6 +40202,8 @@ fi
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
@@ -40981,9 +40983,6 @@ else
fi
GCC_PRAGMA_FLAGS=""
if test $GCC_PCH = 1 ; then
GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
else
case "${host}" in
powerpc-*-darwin* )
GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
@@ -41103,8 +41102,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
;;
esac
PCH_FLAGS=""
if test $GCC_PCH = 1 ; then
if test "x$GCC_PRAGMA_FLAGS" = "x"; then
PCH_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
else
PCH_FLAGS="-DWX_PRECOMP"
fi
fi
CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"
CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"

17
configure.in
View File

@@ -6230,11 +6230,8 @@ else
fi
dnl Check to see if the platform always requires NO_GCC_PRAGMA
GCC_PRAGMA_FLAGS=""
dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
if test $GCC_PCH = 1 ; then
GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
else
case "${host}" in
powerpc-*-darwin* )
dnl Some Apple's GCC version are broken and can't handle the
@@ -6279,8 +6276,18 @@ else
fi
;;
esac
dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
PCH_FLAGS=""
if test $GCC_PCH = 1 ; then
if test "x$GCC_PRAGMA_FLAGS" = "x"; then
PCH_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
else
PCH_FLAGS="-DWX_PRECOMP"
fi
fi
CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"
CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
dnl for convenience, sort the samples in alphabetical order