[vlc-commits] contrib: upnp: set the C/XXFLAGS in a more generic way

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed May 16 11:04:36 2018 +0200| [0347bcc7d8af6c4bea44f430d54bae23377c2db1] | committer: Steve Lhomme

contrib: upnp: set the C/XXFLAGS in a more generic way

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0347bcc7d8af6c4bea44f430d54bae23377c2db1
---

 contrib/src/upnp/rules.mak | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index fcf44fcfbc..48091a5183 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -11,9 +11,12 @@ $(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2:
 
 .sum-upnp: libupnp-$(UPNP_VERSION).tar.bz2
 
+UPNP_CFLAGS   := $(CFLAGS)   -DUPNP_STATIC_LIB
+UPNP_CXXFLAGS := $(CXXFLAGS) -DUPNP_STATIC_LIB
 ifdef HAVE_WIN32
 DEPS_upnp += pthreads $(DEPS_pthreads)
-LIBUPNP_ECFLAGS = -DPTW32_STATIC_LIB
+UPNP_CFLAGS   += -DPTW32_STATIC_LIB
+UPNP_CXXFLAGS += -DPTW32_STATIC_LIB
 endif
 ifdef HAVE_WINSTORE
 CONFIGURE_ARGS=--disable-ipv6 --enable-unspecified_server
@@ -50,6 +53,6 @@ endif
 
 .upnp: upnp
 	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" ./configure --disable-samples --without-documentation $(CONFIGURE_ARGS) $(HOSTCONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(UPNP_CFLAGS)" CXXFLAGS="$(UPNP_CXXFLAGS)" ./configure --disable-samples --without-documentation $(CONFIGURE_ARGS) $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@