Skip to content
Browse files

upnp: adjust include paths of Platinum and Neptune

  • Loading branch information...
1 parent 61df9a4 commit 3a94f2dd11d9556cd3c73ccd1c6ea92fa1df1aad @Montellese Montellese committed May 6, 2014
View
1 xbmc/filesystem/Makefile.in
@@ -124,6 +124,7 @@ SRCS += BlurayDirectory.cpp
endif
ifeq (@USE_UPNP@,1)
+INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP
INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core
INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Platinum
INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaConnect
View
15 xbmc/filesystem/NptXbmcFile.cpp
@@ -32,18 +32,19 @@
/*----------------------------------------------------------------------
| includes
+---------------------------------------------------------------------*/
+#include <limits>
+#include <Neptune/Source/Core/NptDebug.h>
+#include <Neptune/Source/Core/NptFile.h>
+#include <Neptune/Source/Core/NptInterfaces.h>
+#include <Neptune/Source/Core/NptStrings.h>
+#include <Neptune/Source/Core/NptThreads.h>
+#include <Neptune/Source/Core/NptUtils.h>
+
#include "File.h"
#include "FileFactory.h"
#include "utils/log.h"
#include "Util.h"
#include "URL.h"
-#include <limits>
-#include "NptUtils.h"
-#include "NptFile.h"
-#include "NptThreads.h"
-#include "NptInterfaces.h"
-#include "NptStrings.h"
-#include "NptDebug.h"
#ifdef TARGET_WINDOWS
#define S_IWUSR _S_IWRITE
View
5 xbmc/filesystem/UPnPDirectory.cpp
@@ -22,12 +22,13 @@
* <http://www.gnu.org/licenses/>.
*
*/
+#include <Platinum/Source/Platinum/Platinum.h>
+#include <Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h>
+
#include "UPnPDirectory.h"
#include "URL.h"
#include "network/upnp/UPnP.h"
#include "network/upnp/UPnPInternal.h"
-#include "Platinum.h"
-#include "PltSyncMediaBrowser.h"
#include "video/VideoInfoTag.h"
#include "FileItem.h"
#include "utils/log.h"
View
3 xbmc/network/upnp/Makefile.in
@@ -1,5 +1,6 @@
ifeq (@USE_UPNP@, 1)
-INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core \
+INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP \
+ -I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core \
-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Platinum \
-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaConnect \
-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaRenderer \
View
2 xbmc/network/upnp/UPnP.cpp
@@ -23,6 +23,7 @@
*/
#include <set>
+#include <Platinum/Source/Platinum/Platinum.h>
#include "threads/SystemClock.h"
#include "UPnP.h"
@@ -35,7 +36,6 @@
#include "ApplicationMessenger.h"
#include "network/Network.h"
#include "utils/log.h"
-#include "Platinum.h"
#include "URL.h"
#include "profiles/ProfilesManager.h"
#include "settings/Settings.h"
View
3 xbmc/network/upnp/UPnPInternal.cpp
@@ -17,10 +17,11 @@
* <http://www.gnu.org/licenses/>.
*
*/
+#include <Platinum/Source/Platinum/Platinum.h>
+
#include "UPnPInternal.h"
#include "UPnP.h"
#include "UPnPServer.h"
-#include "Platinum.h"
#include "URL.h"
#include "Util.h"
#include "settings/AdvancedSettings.h"
View
7 xbmc/network/upnp/UPnPInternal.h
@@ -18,11 +18,12 @@
*
*/
#pragma once
+#include <Neptune/Source/Core/NptTypes.h>
+#include <Neptune/Source/Core/NptReferences.h>
+#include <Neptune/Source/Core/NptStrings.h>
+
#include "system.h"
#include "utils/StdString.h"
-#include "NptTypes.h"
-#include "NptReferences.h"
-#include "NptStrings.h"
#include "FileItem.h"
class CUPnPServer;
View
6 xbmc/network/upnp/UPnPPlayer.cpp
@@ -18,13 +18,13 @@
* <http://www.gnu.org/licenses/>.
*
*/
+#include <Platinum/Source/Platinum/Platinum.h>
+#include <Platinum/Source/Devices/MediaRenderer/PltMediaController.h>
+#include <Platinum/Source/Devices/MediaServer/PltDidl.h>
#include "UPnPPlayer.h"
#include "UPnP.h"
#include "UPnPInternal.h"
-#include "Platinum.h"
-#include "PltMediaController.h"
-#include "PltDidl.h"
#include "FileItem.h"
#include "threads/Event.h"
#include "utils/log.h"
View
3 xbmc/network/upnp/UPnPRenderer.cpp
@@ -17,11 +17,12 @@
* <http://www.gnu.org/licenses/>.
*
*/
+#include <Platinum/Source/Platinum/Platinum.h>
+
#include "network/Network.h"
#include "UPnPRenderer.h"
#include "UPnP.h"
#include "UPnPInternal.h"
-#include "Platinum.h"
#include "Application.h"
#include "ApplicationMessenger.h"
#include "FileItem.h"
View
3 xbmc/network/upnp/UPnPRenderer.h
@@ -18,7 +18,8 @@
*
*/
#pragma once
-#include "PltMediaRenderer.h"
+#include <Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h>
+
#include "interfaces/IAnnouncer.h"
namespace UPNP
View
3 xbmc/network/upnp/UPnPServer.cpp
@@ -17,11 +17,12 @@
* <http://www.gnu.org/licenses/>.
*
*/
+#include <Platinum/Source/Platinum/Platinum.h>
+
#include "UPnPServer.h"
#include "UPnPInternal.h"
#include "Application.h"
#include "view/GUIViewState.h"
-#include "Platinum.h"
#include "video/VideoThumbLoader.h"
#include "music/Artist.h"
#include "music/MusicThumbLoader.h"
View
3 xbmc/network/upnp/UPnPServer.h
@@ -18,7 +18,8 @@
*
*/
#pragma once
-#include "PltMediaConnect.h"
+#include <Platinum/Source/Devices/MediaConnect/PltMediaConnect.h>
+
#include "interfaces/IAnnouncer.h"
#include "FileItem.h"

0 comments on commit 3a94f2d

Please sign in to comment.
Something went wrong with that request. Please try again.