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

put -DNO_GCC_PRAGMA into CPPFLAGS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-29 20:36:13 +00:00
parent db9ba2468e
commit 74b8433210
3 changed files with 26 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1196
configure vendored
View File

File diff suppressed because one or more lines are too long

12
configure.in
View File

@@ -6058,17 +6058,16 @@ AC_SUBST(CPPUNIT_LIBS)
AC_BAKEFILE AC_BAKEFILE
GCC_PRAGMA_FLAGS=""
dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
if test $GCC_PCH = 1 ; then if test $GCC_PCH = 1 ; then
CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS" GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
else else
case "${host}" in case "${host}" in
powerpc-*-darwin* ) powerpc-*-darwin* )
dnl Some Apple's GCC version are broken and can't handle the dnl Some Apple's GCC version are broken and can't handle the
dnl pragmas: dnl pragmas:
CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS" GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
;; ;;
*-*-mingw32* ) *-*-mingw32* )
dnl MinGW GCC versions >= 3.2 have problems with dnl MinGW GCC versions >= 3.2 have problems with
@@ -6086,14 +6085,14 @@ else
#error "Not GCC 3.2 or greater" #error "Not GCC 3.2 or greater"
#endif #endif
], ],
[CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS" [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
AC_MSG_RESULT([yes])], AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
fi fi
;; ;;
esac esac
fi fi
CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"
dnl for convenience, sort the samples in alphabetical order dnl for convenience, sort the samples in alphabetical order
@@ -6168,6 +6167,7 @@ AC_SUBST(WXCONFIG_INCLUDE)
AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WXCONFIG_LDFLAGS_GUI) AC_SUBST(WXCONFIG_LDFLAGS_GUI)
AC_SUBST(WX_LARGEFILE_FLAGS) AC_SUBST(WX_LARGEFILE_FLAGS)
AC_SUBST(GCC_PRAGMA_FLAGS)
AC_SUBST(CODE_GEN_FLAGS) AC_SUBST(CODE_GEN_FLAGS)
AC_SUBST(CODE_GEN_FLAGS_CXX) AC_SUBST(CODE_GEN_FLAGS_CXX)

5
wx-config.in
View File

@@ -48,6 +48,7 @@ TOOLCHAIN_DEFS="@TOOLCHAIN_DEFS@"
TOOLCHAIN_DLL_DEFS="@TOOLCHAIN_DLL_DEFS@" TOOLCHAIN_DLL_DEFS="@TOOLCHAIN_DLL_DEFS@"
WXCONFIG_INCLUDE="@WXCONFIG_INCLUDE@" WXCONFIG_INCLUDE="@WXCONFIG_INCLUDE@"
WX_LARGEFILE_FLAGS="@WX_LARGEFILE_FLAGS@" WX_LARGEFILE_FLAGS="@WX_LARGEFILE_FLAGS@"
GCC_PRAGMA_FLAGS="@GCC_PRAGMA_FLAGS@"
CODE_GEN_FLAGS="@CODE_GEN_FLAGS@" CODE_GEN_FLAGS="@CODE_GEN_FLAGS@"
CODE_GEN_FLAGS_CXX="@CODE_GEN_FLAGS_CXX@" CODE_GEN_FLAGS_CXX="@CODE_GEN_FLAGS_CXX@"
LDFLAGS_EXE="@LDFLAGS_EXE@" LDFLAGS_EXE="@LDFLAGS_EXE@"
@@ -245,9 +246,9 @@ cppflags()
fi fi
if test $static_flag = yes ; then if test $static_flag = yes ; then
echo $includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS} ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} echo $includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS} ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} ${GCC_PRAGMA_FLAGS}
else else
echo $includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS} ${TOOLCHAIN_DLL_DEFS} ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} echo $includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS} ${TOOLCHAIN_DLL_DEFS} ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} ${GCC_PRAGMA_FLAGS}
fi fi
} }