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

Add library CFLAGS to CXXFLAGS, not CPPFLAGS

Browse Source
This commit is contained in:
Paul Cornett
2020-09-18 10:02:05 -07:00
parent a8fc92d020
commit 5b719394fe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -37145,7 +37145,7 @@ else
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
USE_WEBVIEW_WEBKIT2=1 USE_WEBVIEW_WEBKIT2=1
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
fi fi
@@ -37230,7 +37230,7 @@ else
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
USE_WEBVIEW_WEBKIT=1 USE_WEBVIEW_WEBKIT=1
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
fi fi
@@ -37611,7 +37611,7 @@ $as_echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group(
if test "$wxUSE_GTK" != 1; then if test "$wxUSE_GTK" != 1; then
CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS" CXXFLAGS="$CXXFLAGS $CAIRO_CFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
fi fi
fi fi
@@ -37953,7 +37953,7 @@ fi
fi fi
if test "$wxUSE_GSTREAMER" = "yes"; then if test "$wxUSE_GSTREAMER" = "yes"; then
CPPFLAGS="$GST_CFLAGS $CPPFLAGS" CXXFLAGS="$CXXFLAGS $GST_CFLAGS"
EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_MEDIA="$GST_LIBS"
$as_echo "#define wxUSE_GSTREAMER 1" >>confdefs.h $as_echo "#define wxUSE_GSTREAMER 1" >>confdefs.h

8
configure.in
View File

@@ -7462,7 +7462,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
[webkit2gtk-4.0], [webkit2gtk-4.0],
[ [
USE_WEBVIEW_WEBKIT2=1 USE_WEBVIEW_WEBKIT2=1
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
], ],
[ [
@@ -7478,7 +7478,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
[$webkitgtk >= 1.3.1], [$webkitgtk >= 1.3.1],
[ [
USE_WEBVIEW_WEBKIT=1 USE_WEBVIEW_WEBKIT=1
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" CXXFLAGS="$CXXFLAGS $WEBKIT_CFLAGS"
EXTRALIBS_WEBVIEW="$WEBKIT_LIBS" EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
], ],
[ [
@@ -7748,7 +7748,7 @@ if test "$wxUSE_CAIRO" = "yes" -o "$wx_needs_cairo" = 1; then
dnl We don't need to do this for wxGTK as we already get Cairo dnl We don't need to do this for wxGTK as we already get Cairo
dnl flags as part of GTK+ ones. dnl flags as part of GTK+ ones.
if test "$wxUSE_GTK" != 1; then if test "$wxUSE_GTK" != 1; then
CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS" CXXFLAGS="$CXXFLAGS $CAIRO_CFLAGS"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
fi fi
fi fi
@@ -7853,7 +7853,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
fi fi
if test "$wxUSE_GSTREAMER" = "yes"; then if test "$wxUSE_GSTREAMER" = "yes"; then
CPPFLAGS="$GST_CFLAGS $CPPFLAGS" CXXFLAGS="$CXXFLAGS $GST_CFLAGS"
EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_MEDIA="$GST_LIBS"
AC_DEFINE(wxUSE_GSTREAMER) AC_DEFINE(wxUSE_GSTREAMER)