got rid of COMMON_THREADCPPFLAGS which is not really needed as we can use TOOLCHAIN_DEFS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
478cababc5
commit
a1d22ad7e9
@ -3201,7 +3201,6 @@ dnl ---------------------------------------------------------------------------
|
||||
|
||||
dnl under MSW (except mingw32) we always have thread support
|
||||
CPP_MT_FLAG=
|
||||
COMMON_THREADCPPFLAGS=
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
|
||||
dnl the code below:
|
||||
@ -3463,7 +3462,7 @@ else
|
||||
*-*-mingw32* )
|
||||
CFLAGS="$CFLAGS -mthreads"
|
||||
CXXFLAGS="$CXXFLAGS -mthreads"
|
||||
COMMON_THREADCPPFLAGS="-mthreads"
|
||||
TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
|
||||
LDFLAGS="$LDFLAGS -mthreads"
|
||||
;;
|
||||
esac
|
||||
@ -5051,7 +5050,6 @@ AC_SUBST(GUIDIST)
|
||||
AC_SUBST(PORT_FILES)
|
||||
AC_SUBST(DISTDIR)
|
||||
|
||||
AC_SUBST(COMMON_THREADCPPFLAGS)
|
||||
dnl additional subdirectories where we will build
|
||||
AC_SUBST(SAMPLES_SUBDIRS)
|
||||
|
||||
|
@ -42,9 +42,9 @@ cppflags()
|
||||
includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
|
||||
|
||||
if test $static_flag = yes ; then
|
||||
echo $includes @COMMON_THREADCPPFLAGS@ @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
|
||||
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
|
||||
else
|
||||
echo $includes @COMMON_THREADCPPFLAGS@ @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@
|
||||
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@
|
||||
fi
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user