Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents 248d3f1 + 4dad531 commit acfe079389e09617192f5f32e2270ddace9e84fc @opdenkamp opdenkamp committed Apr 18, 2011
Showing 549 changed files with 189,155 additions and 9,305 deletions.
View
@@ -45,6 +45,13 @@ config.log
/build/
.DS_Store
*.dSYM
+/tools/darwin/depends/config.site
+/tools/darwin/depends/config.site.mk
+/tools/darwin/depends/Makefile
+/tools/darwin/depends/Makefile.include
+/tools/darwin/depends/configure
+/tools/darwin/depends/**/.gitignore
+/tools/darwin/depends/**/.installed
/tools/osx/osx-depends/**/.gitignore
/tools/osx/osx-depends/**/.installed
/tools/osx/ios-depends/**/.gitignore
View
@@ -144,11 +144,10 @@ VIS_DIRS+=\
xbmc/visualizations/XBMCProjectM \
endif
-ifeq ($(findstring osx,@ARCH@), osx)
-VIS_DIRS+=xbmc/visualizations/iTunes \
-
+ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
+VIS_DIRS+=xbmc/visualizations/iTunes
endif
-ifneq (@BUILD_GOOM@,1)
+ifneq (@DISABLE_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom \
endif
@@ -421,26 +420,14 @@ exports:
dllloader: exports
$(MAKE) xbmc/cores/DllLoader/dllloader.a
visualizations: exports
-ifneq ($(findstring arm,@ARCH@), arm)
- $(MAKE) -C xbmc/visualizations/OpenGLSpectrum
- $(MAKE) -C xbmc/visualizations/WaveForm
- $(MAKE) -C xbmc/visualizations/XBMCProjectM
-ifeq ($(findstring osx,@ARCH@), osx)
- $(MAKE) -C xbmc/visualizations/iTunes
-endif
-ifneq (@BUILD_GOOM@,1)
-ifeq ($(or $(findstring powerpc-linux,@ARCH@),$(findstring powerpc64-linux,@ARCH@)),)
- $(MAKE) -C xbmc/visualizations/Goom
-endif
-endif
-endif
+ for d in $(VIS_DIRS); do $(MAKE) -C $$d; done
pvrclients: exports
$(MAKE) -C xbmc/pvrclients/MediaPortal
$(MAKE) -C xbmc/pvrclients/mythtv
$(MAKE) -C xbmc/pvrclients/vdr-vnsi
$(MAKE) -C xbmc/pvrclients/tvheadend
screensavers: exports
-ifneq ($(findstring arm,@ARCH@), arm)
+ifeq (@USE_OPENGL@,1)
$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
endif
libaddon: exports
@@ -632,9 +619,8 @@ else
endif
xbmc-xrandr: xbmc-xrandr.c
-ifeq ($(findstring osx,@ARCH@), osx)
+ifneq (1,@USE_XRANDR@)
# xbmc-xrandr.c gets picked up by the default make rules
- # so only exclude it for osx builds
@echo "excluding xbmc-xrandr"
else
$(CC) $(CFLAGS) $(LDFLAGS) -o xbmc-xrandr xbmc-xrandr.c -lXrandr -lX11
@@ -665,7 +651,9 @@ install-binaries: install-scripts
@echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
@install -d $(DESTDIR)$(libdir)/xbmc
@install xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin
+ifeq (1,@USE_XRANDR@)
@install xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr
+endif
@echo "You can run XBMC with the command 'xbmc'"
endif
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 18ACF8E313597B0000B67371 /* RecentlyAddedJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */; };
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E121301753F006ABC13 /* CFNetwork.framework */; };
7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */; };
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */; };
@@ -928,6 +929,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecentlyAddedJob.cpp; sourceTree = "<group>"; };
+ 18ACF8E213597B0000B67371 /* RecentlyAddedJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentlyAddedJob.h; sourceTree = "<group>"; };
4D5D2E121301753F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C99B73D133D372300FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
7C99B73E133D372300FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
@@ -5115,6 +5118,8 @@
F56C7753131EC154000AD0F6 /* PerformanceSample.h */,
F56C7754131EC154000AD0F6 /* PerformanceStats.cpp */,
F56C7755131EC154000AD0F6 /* PerformanceStats.h */,
+ 18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */,
+ 18ACF8E213597B0000B67371 /* RecentlyAddedJob.h */,
F56C7758131EC154000AD0F6 /* RegExp.cpp */,
F56C7759131EC154000AD0F6 /* RegExp.h */,
F56C775A131EC154000AD0F6 /* RingBuffer.cpp */,
@@ -6742,6 +6747,7 @@
F5AE41121341751E0004BD79 /* VideoLibrary.cpp in Sources */,
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */,
F5AE453B134D2E720004BD79 /* JSONServiceDescription.cpp in Sources */,
+ 18ACF8E313597B0000B67371 /* RecentlyAddedJob.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6807,7 +6813,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/lib/libRTV\"",
- "\"$(SRCROOT)/lib/libXBMS\"",
"\"$(SRCROOT)/lib/libXDAAP\"",
"\"$(SRCROOT)/lib/cmyth/libcmyth\"",
"\"$(SRCROOT)/lib/cmyth/librefmem\"",
@@ -6880,7 +6885,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/lib/libRTV\"",
- "\"$(SRCROOT)/lib/libXBMS\"",
"\"$(SRCROOT)/lib/libXDAAP\"",
"\"$(SRCROOT)/lib/cmyth/libcmyth\"",
"\"$(SRCROOT)/lib/cmyth/librefmem\"",
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 18ACF8FD13597B5700B67371 /* RecentlyAddedJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */; };
3255316612B2D02400837CD2 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3255316512B2D02400837CD2 /* CoreAudio.framework */; };
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */; };
7C99B6E9133D36E200FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */; };
@@ -928,6 +929,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecentlyAddedJob.cpp; sourceTree = "<group>"; };
+ 18ACF8FC13597B5700B67371 /* RecentlyAddedJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentlyAddedJob.h; sourceTree = "<group>"; };
3255316512B2D02400837CD2 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
@@ -5483,6 +5486,8 @@
F56C8742131F42EC000AD0F6 /* PerformanceSample.h */,
F56C8743131F42EC000AD0F6 /* PerformanceStats.cpp */,
F56C8744131F42EC000AD0F6 /* PerformanceStats.h */,
+ 18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */,
+ 18ACF8FC13597B5700B67371 /* RecentlyAddedJob.h */,
F56C8747131F42EC000AD0F6 /* RegExp.cpp */,
F56C8748131F42EC000AD0F6 /* RegExp.h */,
F56C8749131F42EC000AD0F6 /* RingBuffer.cpp */,
@@ -6757,6 +6762,7 @@
F5AE4165134175520004BD79 /* VideoLibrary.cpp in Sources */,
F5AE4166134175520004BD79 /* XBMCOperations.cpp in Sources */,
F5AE4530134D2E3E0004BD79 /* JSONServiceDescription.cpp in Sources */,
+ 18ACF8FD13597B5700B67371 /* RecentlyAddedJob.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6821,7 +6827,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/lib/libRTV\"",
- "\"$(SRCROOT)/lib/libXBMS\"",
"\"$(SRCROOT)/lib/libXDAAP\"",
"\"$(SRCROOT)/lib/cmyth/libcmyth\"",
"\"$(SRCROOT)/lib/cmyth/librefmem\"",
@@ -6891,7 +6896,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/lib/libRTV\"",
- "\"$(SRCROOT)/lib/libXBMS\"",
"\"$(SRCROOT)/lib/libXDAAP\"",
"\"$(SRCROOT)/lib/cmyth/libcmyth\"",
"\"$(SRCROOT)/lib/cmyth/librefmem\"",
Oops, something went wrong. Retry.

0 comments on commit acfe079

Please sign in to comment.