Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/xbmc/xbmc
Browse files Browse the repository at this point in the history
  • Loading branch information
@huceke
huceke committed Aug 4, 2012
2 parents ea1a329 + ef5fd1c commit 6eb8ff0
Show file tree
Hide file tree
Showing 129 changed files with 2,189 additions and 797 deletions.
6 changes: 2 additions & 4 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ LIB_DIRS=\

ifeq (@USE_MYSQL@,1)
LIB_DIRS += lib/cmyth
CMYTH=cmyth
endif

SS_DIRS=
Expand Down Expand Up @@ -326,10 +327,7 @@ imagelib: dllloader

codecs: papcodecs dvdpcodecs

libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@[email protected]
ifeq (@USE_MYSQL@,1)
libs += cmyth
endif
libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@[email protected] $(CMYTH)

externals: codecs libs visualizations screensavers

Expand Down
32 changes: 24 additions & 8 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
DF527783151BAFD600B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52777D151BAFD600B5B63B /* WebSocketV8.cpp */; };
DF527788151BAFEE00B5B63B /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527784151BAFEE00B5B63B /* Base64.cpp */; };
DF527789151BAFEE00B5B63B /* HttpResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527786151BAFEE00B5B63B /* HttpResponse.cpp */; };
DF830D4815BB2CFC00602BE6 /* GUIKeyboardFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D4515BB2CFC00602BE6 /* GUIKeyboardFactory.cpp */; };
DF830D4B15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D4915BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp */; };
DF93D7701444B09C007C6459 /* AFPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7381444B09C007C6459 /* AFPFile.cpp */; };
DF93D7731444B09C007C6459 /* CDDAFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D73E1444B09C007C6459 /* CDDAFile.cpp */; };
DF93D7741444B09C007C6459 /* CurlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7401444B09C007C6459 /* CurlFile.cpp */; };
Expand Down Expand Up @@ -333,7 +335,6 @@
F56C7959131EC154000AD0F6 /* GUIDialogFileBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C736F131EC151000AD0F6 /* GUIDialogFileBrowser.cpp */; };
F56C795A131EC154000AD0F6 /* GUIDialogGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7371131EC151000AD0F6 /* GUIDialogGamepad.cpp */; };
F56C795B131EC154000AD0F6 /* GUIDialogKaiToast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7373131EC151000AD0F6 /* GUIDialogKaiToast.cpp */; };
F56C795C131EC154000AD0F6 /* GUIDialogKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7375131EC151000AD0F6 /* GUIDialogKeyboard.cpp */; };
F56C795D131EC154000AD0F6 /* GUIDialogMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7377131EC151000AD0F6 /* GUIDialogMediaSource.cpp */; };
F56C795E131EC154000AD0F6 /* GUIDialogMuteBug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7379131EC151000AD0F6 /* GUIDialogMuteBug.cpp */; };
F56C795F131EC154000AD0F6 /* GUIDialogNumeric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C737B131EC151000AD0F6 /* GUIDialogNumeric.cpp */; };
Expand Down Expand Up @@ -1083,6 +1084,11 @@
DF527785151BAFEE00B5B63B /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
DF527786151BAFEE00B5B63B /* HttpResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpResponse.cpp; sourceTree = "<group>"; };
DF527787151BAFEE00B5B63B /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; };
DF830D4415BB2CFC00602BE6 /* GUIKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIKeyboard.h; sourceTree = "<group>"; };
DF830D4515BB2CFC00602BE6 /* GUIKeyboardFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIKeyboardFactory.cpp; sourceTree = "<group>"; };
DF830D4615BB2CFC00602BE6 /* GUIKeyboardFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIKeyboardFactory.h; sourceTree = "<group>"; };
DF830D4915BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKeyboardGeneric.cpp; sourceTree = "<group>"; };
DF830D4A15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKeyboardGeneric.h; sourceTree = "<group>"; };
DF93D7381444B09C007C6459 /* AFPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPFile.cpp; sourceTree = "<group>"; };
DF93D7391444B09C007C6459 /* AFPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPFile.h; sourceTree = "<group>"; };
DF93D73E1444B09C007C6459 /* CDDAFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDAFile.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1747,8 +1753,6 @@
F56C7372131EC151000AD0F6 /* GUIDialogGamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogGamepad.h; sourceTree = "<group>"; };
F56C7373131EC151000AD0F6 /* GUIDialogKaiToast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKaiToast.cpp; sourceTree = "<group>"; };
F56C7374131EC151000AD0F6 /* GUIDialogKaiToast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKaiToast.h; sourceTree = "<group>"; };
F56C7375131EC151000AD0F6 /* GUIDialogKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKeyboard.cpp; sourceTree = "<group>"; };
F56C7376131EC151000AD0F6 /* GUIDialogKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKeyboard.h; sourceTree = "<group>"; };
F56C7377131EC151000AD0F6 /* GUIDialogMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaSource.cpp; sourceTree = "<group>"; };
F56C7378131EC151000AD0F6 /* GUIDialogMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaSource.h; sourceTree = "<group>"; };
F56C7379131EC151000AD0F6 /* GUIDialogMuteBug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMuteBug.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4194,8 +4198,8 @@
F56C7372131EC151000AD0F6 /* GUIDialogGamepad.h */,
F56C7373131EC151000AD0F6 /* GUIDialogKaiToast.cpp */,
F56C7374131EC151000AD0F6 /* GUIDialogKaiToast.h */,
F56C7375131EC151000AD0F6 /* GUIDialogKeyboard.cpp */,
F56C7376131EC151000AD0F6 /* GUIDialogKeyboard.h */,
DF830D4915BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp */,
DF830D4A15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.h */,
F56C7377131EC151000AD0F6 /* GUIDialogMediaSource.cpp */,
F56C7378131EC151000AD0F6 /* GUIDialogMediaSource.h */,
F56C7379131EC151000AD0F6 /* GUIDialogMuteBug.cpp */,
Expand Down Expand Up @@ -4615,6 +4619,9 @@
F56C74C1131EC152000AD0F6 /* GUIIncludes.h */,
F56C751C131EC152000AD0F6 /* GUIInfoTypes.cpp */,
F56C74C2131EC152000AD0F6 /* GUIInfoTypes.h */,
DF830D4415BB2CFC00602BE6 /* GUIKeyboard.h */,
DF830D4515BB2CFC00602BE6 /* GUIKeyboardFactory.cpp */,
DF830D4615BB2CFC00602BE6 /* GUIKeyboardFactory.h */,
F56C751D131EC152000AD0F6 /* GUILabel.cpp */,
F56C74C3131EC152000AD0F6 /* GUILabel.h */,
F56C751E131EC152000AD0F6 /* GUILabelControl.cpp */,
Expand Down Expand Up @@ -6478,7 +6485,6 @@
F56C7959131EC154000AD0F6 /* GUIDialogFileBrowser.cpp in Sources */,
F56C795A131EC154000AD0F6 /* GUIDialogGamepad.cpp in Sources */,
F56C795B131EC154000AD0F6 /* GUIDialogKaiToast.cpp in Sources */,
F56C795C131EC154000AD0F6 /* GUIDialogKeyboard.cpp in Sources */,
F56C795D131EC154000AD0F6 /* GUIDialogMediaSource.cpp in Sources */,
F56C795E131EC154000AD0F6 /* GUIDialogMuteBug.cpp in Sources */,
F56C795F131EC154000AD0F6 /* GUIDialogNumeric.cpp in Sources */,
Expand Down Expand Up @@ -7219,6 +7225,8 @@
36A9465315AA269B00727135 /* DirectoryNodeTags.cpp in Sources */,
7C1D698B15A8142F00658B65 /* DatabaseManager.cpp in Sources */,
7C1A493D15A968BA004AF4A4 /* SeekHandler.cpp in Sources */,
DF830D4815BB2CFC00602BE6 /* GUIKeyboardFactory.cpp in Sources */,
DF830D4B15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -7308,6 +7316,10 @@
"\"$(SRCROOT)/lib/ffmpeg/libpostproc\"",
"\"$(SRCROOT)/lib/ffmpeg/libswscale\"",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-Wreorder",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
"-Wl,-undefined,dynamic_lookup",
Expand Down Expand Up @@ -7347,7 +7359,7 @@
PRODUCT_NAME = XBMC;
TARGETED_DEVICE_FAMILY = "2,3";
USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WARNING_CFLAGS = "-Wreorder";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/$(SDK_NAME)_$(ARCHS)";
};
Expand Down Expand Up @@ -7425,6 +7437,10 @@
"\"$(SRCROOT)/lib/ffmpeg/libpostproc\"",
"\"$(SRCROOT)/lib/ffmpeg/libswscale\"",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-Wreorder",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
"-Wl,-undefined,dynamic_lookup",
Expand Down Expand Up @@ -7464,7 +7480,7 @@
PRODUCT_NAME = XBMC;
TARGETED_DEVICE_FAMILY = "2,3";
USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WARNING_CFLAGS = "-Wreorder";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = frappliance;
XBMC_DEPENDS = "/Users/Shared/xbmc-depends/$(SDK_NAME)_$(ARCHS)";
};
Expand Down
Loading

0 comments on commit 6eb8ff0

Please sign in to comment.