From b9c30b2c55c6bb202639da2cbd98678533418d1a Mon Sep 17 00:00:00 2001
From: althekiller <althekiller@svn>
Date: Mon, 21 Dec 2009 00:50:28 +0000
Subject: changed: Add our source root as first include path in CXXFLAGS to
ensure our config.h is included, not the one from some external. fixed:
Supress several compile warnings
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25914 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
---
xbmc/Makefile | 2 +-
xbmc/cdrip/Makefile | 2 +-
xbmc/cores/VideoRenderers/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDCodecs/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDDemuxers/Makefile | 2 +-
xbmc/cores/dvdplayer/DVDSubtitles/Makefile | 2 +-
xbmc/cores/dvdplayer/Makefile | 2 +-
xbmc/cores/paplayer/Makefile.in | 2 +-
xbmc/cores/playercorefactory/Makefile | 2 +-
xbmc/karaoke/Makefile | 2 +-
xbmc/lib/libPython/Makefile | 2 +-
xbmc/lib/libPython/xbmcmodule/Makefile | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/xbmc/Makefile b/xbmc/Makefile
index 6a8e2e805c..abfbdcb935 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -1,4 +1,4 @@
-INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg
INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-Ilib/libUPnP/Platinum/Source/Platinum \
diff --git a/xbmc/cdrip/Makefile b/xbmc/cdrip/Makefile
index bf8948d9d5..6544e77490 100644
--- a/xbmc/cdrip/Makefile
+++ b/xbmc/cdrip/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -I../linux -I../../guilib
+INCLUDES=-I../.. -I. -I../ -I../linux -I../../guilib
SRCS=CDDARipper.cpp \
CDDAReader.cpp \
diff --git a/xbmc/cores/VideoRenderers/Makefile b/xbmc/cores/VideoRenderers/Makefile
index 4f5a86ecec..424c25ab3d 100644
--- a/xbmc/cores/VideoRenderers/Makefile
+++ b/xbmc/cores/VideoRenderers/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../../ -I../../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer/Codecs/ffmpeg -I../dvdplayer
+INCLUDES=-I../../.. -I. -I.. -I../../ -I../../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer/Codecs/ffmpeg -I../dvdplayer
SRCS=LinuxRenderer.cpp \
RenderManager.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
index 6ebcdd1c0f..13e8e342dc 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../../ -I../../.. -I../../Codecs/ffmpeg -I../../../../ -I../../../../linux -I../../../../../guilib
+INCLUDES=-I../../../../.. -I. -I../../ -I../../.. -I../../Codecs/ffmpeg -I../../../../ -I../../../../linux -I../../../../../guilib
CXXFLAGS+=-DHAVE_MMX
SRCS= DVDAudioCodecFFmpeg.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Makefile b/xbmc/cores/dvdplayer/DVDCodecs/Makefile
index 590072e1ba..1d12f48f00 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Makefile
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -I../../ -I../../../ -I../Codecs/ffmpeg -I../../../linux -I../../../../guilib
+INCLUDES=-I../../../.. -I. -I../ -I../../ -I../../../ -I../Codecs/ffmpeg -I../../../linux -I../../../../guilib
SRCS= DVDCodecUtils.cpp \
DVDFactoryCodec.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
index 02354fa6f0..a055ba6a9e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../../ -I../../../../ -I../../Codecs/ffmpeg -I../../../../linux -I../../../../../guilib
+INCLUDES=-I../../../../.. -I. -I../../ -I../../../../ -I../../Codecs/ffmpeg -I../../../../linux -I../../../../../guilib
SRCS= DVDOverlayCodecCC.cpp \
DVDOverlayCodecFFmpeg.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
index d21ed06271..7b7f689d8e 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../../ -I../../../../ -I../../Codecs/ffmpeg -I../../../../linux -I../../../../../guilib
+INCLUDES=-I../../../../.. -I. -I../../ -I../../../../ -I../../Codecs/ffmpeg -I../../../../linux -I../../../../../guilib
SRCS= DVDVideoCodecFFmpeg.cpp \
DVDVideoCodecLibMpeg2.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/Makefile b/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
index 79421ee8ce..2ed3fa11a1 100644
--- a/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
+++ b/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../.. -I../../../ -I../Codecs/ffmpeg -I../../../utils -I../../../linux -I../../../../guilib
+INCLUDES=-I../../../.. -I. -I.. -I../.. -I../../../ -I../Codecs/ffmpeg -I../../../utils -I../../../linux -I../../../../guilib
CXXFLAGS+=-D__STDC_CONSTANT_MACROS \
SRCS= DVDDemux.cpp \
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/Makefile b/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
index 28a04e1dac..5d81734804 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
+++ b/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -I../../../ -I../Codecs/ffmpeg -I../../../linux -I../../../../guilib -I../../../FileSystem/ -I../DVDCodecs/Overlay/
+INCLUDES=-I../../../.. -I. -I../ -I../../../ -I../Codecs/ffmpeg -I../../../linux -I../../../../guilib -I../../../FileSystem/ -I../DVDCodecs/Overlay/
SRCS= DVDFactorySubtitle.cpp \
DVDSubtitleLineCollection.cpp \
diff --git a/xbmc/cores/dvdplayer/Makefile b/xbmc/cores/dvdplayer/Makefile
index f10c25848b..0163e4d63a 100644
--- a/xbmc/cores/dvdplayer/Makefile
+++ b/xbmc/cores/dvdplayer/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../../ -ICodecs/ffmpeg -I../../linux -I../../utils -I../../../guilib -I../../lib
+INCLUDES=-I../../.. -I. -I.. -I../../ -ICodecs/ffmpeg -I../../linux -I../../utils -I../../../guilib -I../../lib
CXXFLAGS+=-D__STDC_FORMAT_MACROS
diff --git a/xbmc/cores/paplayer/Makefile.in b/xbmc/cores/paplayer/Makefile.in
index f7e1dbf21e..132885fb8c 100644
--- a/xbmc/cores/paplayer/Makefile.in
+++ b/xbmc/cores/paplayer/Makefile.in
@@ -2,7 +2,7 @@ ARCH=@ARCH@
.PHONY: compile
-INCLUDES=-I. -I../../ -I../../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer -I..
+INCLUDES=-I../../.. -I. -I../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer -I..
ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-I../dvdplayer/Codecs/ffmpeg
endif
diff --git a/xbmc/cores/playercorefactory/Makefile b/xbmc/cores/playercorefactory/Makefile
index b21014261e..677bfd5e79 100644
--- a/xbmc/cores/playercorefactory/Makefile
+++ b/xbmc/cores/playercorefactory/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../ -I../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer -I../paplayer -I../dvdplayer/Codecs/ffmpeg
+INCLUDES=-I../../.. -I. -I../ -I../../ -I../../linux -I../../../guilib -I../../utils -I../dvdplayer -I../paplayer -I../dvdplayer/Codecs/ffmpeg
SRCS=PlayerCoreFactory.cpp \
PlayerSelectionRule.cpp
diff --git a/xbmc/karaoke/Makefile b/xbmc/karaoke/Makefile
index ee52d14168..6532e35234 100644
--- a/xbmc/karaoke/Makefile
+++ b/xbmc/karaoke/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../linux -I../../guilib -I../cores -I../utils -I../cores/dvdplayer/Codecs/ffmpeg
+INCLUDES=-I../../ -I. -I.. -I../linux -I../../guilib -I../cores -I../utils -I../cores/dvdplayer/Codecs/ffmpeg
SRCS=GUIDialogKaraokeSongSelector.cpp \
karaokelyricscdg.cpp \
diff --git a/xbmc/lib/libPython/Makefile b/xbmc/lib/libPython/Makefile
index 193983c8ad..0cdd63792f 100644
--- a/xbmc/lib/libPython/Makefile
+++ b/xbmc/lib/libPython/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../../ -I../../linux -I../../../guilib -I.
+INCLUDES=-I../../.. -I. -I../../ -I../../linux -I../../../guilib -I.
SRCS=XBPython.cpp XBPythonDll.cpp XBPyThread.cpp XBPythonDllFuncs.S
LIB=python.a
diff --git a/xbmc/lib/libPython/xbmcmodule/Makefile b/xbmc/lib/libPython/xbmcmodule/Makefile
index a3ab68c0f6..989ef1c967 100644
--- a/xbmc/lib/libPython/xbmcmodule/Makefile
+++ b/xbmc/lib/libPython/xbmcmodule/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I../../../ -I../../../linux -I../../../../guilib -I../../../utils -I../../../cores
+INCLUDES=-I../../../.. -I. -I../../../ -I../../../linux -I../../../../guilib -I../../../utils -I../../../cores
SRCS=action.cpp controlbutton.cpp controlcheckmark.cpp control.cpp controlfadelabel.cpp controlimage.cpp controllabel.cpp controllist.cpp controlprogress.cpp controlspin.cpp controltextbox.cpp dialog.cpp GUIPythonWindow.cpp GUIPythonWindowDialog.cpp GUIPythonWindowXML.cpp GUIPythonWindowXMLDialog.cpp infotagmusic.cpp infotagvideo.cpp keyboard.cpp listitem.cpp player.cpp pyplaylist.cpp PythonPlayer.cpp pyutil.cpp window.cpp winxml.cpp winxmldialog.cpp xbmcguimodule.cpp xbmcmodule.cpp controlgroup.cpp xbmcplugin.cpp controlradiobutton.cpp language.cpp PythonSettings.cpp
--
cgit v1.2.3