diff options
| author | montellese <montellese@xbmc.org> | 2014-05-19 18:38:21 +0200 |
|---|---|---|
| committer | montellese <montellese@xbmc.org> | 2014-05-20 20:15:45 +0200 |
| commit | ae48f9b6b94f75b427b6b67522b97cbd049730cd (patch) | |
| tree | 2d79cd8cbc5c312313608b229909bd3917ca0458 | |
| parent | 80a073976f7287f34f0d6b31dea73333aa7df09e (diff) | |
make sure NPT_CONFIG_ENABLE_LOGGING is defined
| -rw-r--r-- | Makefile.include.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/libUPnP/Makefile.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.include.in b/Makefile.include.in index b409aec42b..6ee228abfe 100644 --- a/Makefile.include.in +++ b/Makefile.include.in @@ -53,6 +53,7 @@ DEFINES+= \ -DBIN_INSTALL_PATH="\"$(libdir)/xbmc\"" \ -DINSTALL_PATH="\"$(datarootdir)/xbmc\"" \ @SDL_DEFINES@ \ + @UPNP_DEFINES@ \ @DEFS@ \ ifeq ($(findstring osx,$(ARCH)), osx) diff --git a/configure.in b/configure.in index 8adde48932..7ae4041609 100644 --- a/configure.in +++ b/configure.in @@ -2407,6 +2407,7 @@ fi if test "x$use_upnp" != "xno"; then final_message="$final_message\n UPnP support:\t\tYes" USE_UPNP=1 + UPNP_DEFINES="-DNPT_CONFIG_ENABLE_LOGGING" AC_DEFINE([USE_UPNP], [1], [Define to 1 to enable UPnP support.]) else USE_UPNP=0 @@ -2659,6 +2660,7 @@ AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) +AC_SUBST(UPNP_DEFINES) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in index 843806cc61..efdc05a48d 100644 --- a/lib/libUPnP/Makefile.in +++ b/lib/libUPnP/Makefile.in @@ -100,8 +100,6 @@ endif INCLUDES=-I./Neptune/Source/Core -I./Platinum/Source/Core -I./Platinum/Source/Platinum -I./Platinum/Source/Devices/MediaConnect -I./Platinum/Source/Devices/MediaRenderer -I./Platinum/Source/Devices/MediaServer -I./Neptune/Source/System/Posix -I./Platinum/Source/Extras -CXXFLAGS+=-DNPT_CONFIG_ENABLE_LOGGING - LIB=libupnp.a include ../../Makefile.include |