Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents b485416 + cd04d6e commit 60222aaa6b541c258567f5c726013aed191565ce @opdenkamp opdenkamp committed Jul 31, 2011
Showing with 6,900 additions and 3,886 deletions.
  1. +3 −9 .gitignore
  2. +27 −38 Makefile.in
  3. +49 −57 Makefile.include.in
  4. +404 −359 XBMC-ATV2.xcodeproj/project.pbxproj
  5. +398 −367 XBMC-IOS.xcodeproj/project.pbxproj
  6. +540 −368 XBMC.xcodeproj/project.pbxproj
  7. +18 −75 addons/skin.confluence/720p/DialogPVRGuideInfo.xml
  8. +71 −83 addons/skin.confluence/720p/DialogPVRGuideOSD.xml
  9. +2 −2 addons/skin.confluence/720p/Home.xml
  10. +112 −4 addons/skin.confluence/720p/ViewsPVR.xml
  11. +1 −1 addons/skin.confluence/language/Catalan/strings.xml
  12. +1 −1 addons/skin.confluence/language/Chinese (Simple)/strings.xml
  13. +4 −4 addons/skin.confluence/language/Dutch/strings.xml
  14. BIN addons/skin.confluence/media/flagging/audio/pcm_bluray.png
  15. +4 −2 configure.in
  16. +40 −27 language/Catalan/strings.xml
  17. +10 −2 language/Chinese (Simple)/strings.xml
  18. +52 −3 language/Dutch/langinfo.xml
  19. +4 −4 language/Dutch/strings.xml
  20. +5 −0 language/English/strings.xml
  21. +105 −12 lib/DllAvFilter.h
  22. +7 −0 lib/addons/script.module.pil/Makefile.in
  23. +0 −1 lib/ffmpeg/build_xbmc_win32.sh
  24. +4 −10 lib/libnfs/Makefile
  25. +0 −12 lib/libnfs/printf.patch
  26. +3 −3 lib/libsidplay2/Makefile.in
  27. +146 −8 project/VS2010Express/XBMC for Windows.sln
  28. +12 −4 project/VS2010Express/XBMC.vcxproj
  29. +41 −7 project/VS2010Express/XBMC.vcxproj.filters
  30. +6 −0 system/keymaps/keyboard.xml
  31. +2 −1 tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp
  32. +4 −1 tools/darwin/depends/libbluray/Makefile
  33. +3 −7 tools/darwin/depends/libnfs/Makefile
  34. +0 −12 tools/darwin/depends/libnfs/printf.patch
  35. +16 −63 xbmc/Application.cpp
  36. +12 −0 xbmc/Application.h
  37. +1 −0 xbmc/ApplicationMessenger.h
  38. +1 −2 xbmc/BackgroundInfoLoader.cpp
  39. +1 −0 xbmc/FileItem.cpp
  40. +24 −0 xbmc/GUIInfoManager.cpp
  41. +9 −7 xbmc/GUIInfoManager.h
  42. +4 −3 xbmc/GUILargeTextureManager.cpp
  43. +5 −2 xbmc/InertialScrollingHandler.cpp
  44. +3 −2 xbmc/PartyModeManager.cpp
  45. +3 −2 xbmc/PlayListPlayer.cpp
  46. +5 −4 xbmc/SectionLoader.cpp
  47. +3 −2 xbmc/Util.cpp
  48. +4 −1 xbmc/addons/AddonDll.h
  49. +1 −4 xbmc/addons/AddonStatusHandler.cpp
  50. +1 −1 xbmc/addons/Scraper.cpp
  51. +2 −2 xbmc/addons/include/xbmc_pvr_types.h
  52. +3 −2 xbmc/cdrip/CDDARipper.cpp
  53. +2 −1 xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
  54. +7 −4 xbmc/cores/AudioRenderers/NullDirectSound.cpp
  55. +1 −1 xbmc/cores/AudioRenderers/NullDirectSound.h
  56. +9 −7 xbmc/cores/AudioRenderers/Win32DirectSound.cpp
  57. +3 −2 xbmc/cores/AudioRenderers/Win32WASAPI.cpp
  58. +14 −21 xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
  59. +4 −3 xbmc/cores/DummyVideoPlayer.cpp
  60. +1 −1 xbmc/cores/DummyVideoPlayer.h
  61. +5 −6 xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
  62. +1 −1 xbmc/cores/VideoRenderers/RenderManager.cpp
  63. +6 −0 xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
  64. +236 −0 xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp
  65. +42 −0 xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h
  66. +1 −0 xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in
  67. +6 −3 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  68. +1 −0 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
  69. +13 −9 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
  70. +2 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
  71. +1 −2 xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
  72. +4 −3 xbmc/cores/dvdplayer/DVDFileInfo.cpp
  73. +4 −3 xbmc/cores/dvdplayer/DVDMessage.cpp
  74. +2 −1 xbmc/cores/dvdplayer/DVDMessageTracker.cpp
  75. +17 −11 xbmc/cores/dvdplayer/DVDPlayer.cpp
  76. +2 −2 xbmc/cores/dvdplayer/DVDPlayer.h
  77. +1 −3 xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
  78. +1 −6 xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
  79. +0 −1 xbmc/cores/dvdplayer/DVDPlayerTeletext.h
  80. +1 −2 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
  81. +5 −4 xbmc/cores/paplayer/PAPlayer.cpp
  82. +4 −2 xbmc/dbwrappers/Database.cpp
  83. +2 −2 xbmc/dbwrappers/Database.h
  84. +1 −1 xbmc/dialogs/GUIDialogBusy.cpp
  85. +4 −3 xbmc/dialogs/GUIDialogCache.cpp
  86. +2 −2 xbmc/dialogs/GUIDialogCache.h
  87. +18 −0 xbmc/dialogs/GUIDialogMediaSource.cpp
  88. +1 −1 xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp
  89. +20 −9 xbmc/epg/Epg.cpp
  90. +3 −1 xbmc/epg/Epg.h
  91. +127 −151 xbmc/epg/EpgContainer.cpp
  92. +36 −25 xbmc/epg/EpgContainer.h
  93. +25 −2 xbmc/epg/EpgInfoTag.cpp
  94. +5 −0 xbmc/epg/EpgInfoTag.h
  95. +46 −5 xbmc/epg/GUIEPGGridContainer.cpp
  96. +3 −2 xbmc/epg/GUIEPGGridContainer.h
  97. +3 −2 xbmc/filesystem/CacheCircular.cpp
  98. +3 −2 xbmc/filesystem/CacheMemBuffer.cpp
  99. +5 −4 xbmc/filesystem/CacheStrategy.cpp
  100. +5 −4 xbmc/filesystem/DllLibCurl.cpp
  101. +107 −93 xbmc/filesystem/DllLibNfs.h
  102. +6 −5 xbmc/filesystem/FileCache.cpp
  103. +168 −90 xbmc/filesystem/FileNFS.cpp
  104. +44 −12 xbmc/filesystem/FileNFS.h
  105. +9 −8 xbmc/filesystem/FileSFTP.cpp
  106. +4 −3 xbmc/filesystem/FileShoutcast.cpp
  107. +3 −2 xbmc/filesystem/HDHomeRun.cpp
  108. +7 −6 xbmc/filesystem/HTSPDirectory.cpp
  109. +5 −4 xbmc/filesystem/MultiPathDirectory.cpp
  110. +3 −2 xbmc/filesystem/MusicSearchDirectory.cpp
  111. +5 −4 xbmc/filesystem/MythFile.cpp
  112. +4 −3 xbmc/filesystem/MythSession.cpp
  113. +98 −32 xbmc/filesystem/NFSDirectory.cpp
  114. +11 −8 xbmc/filesystem/NFSDirectory.h
  115. +6 −5 xbmc/filesystem/PluginDirectory.cpp
  116. +3 −2 xbmc/filesystem/SAPDirectory.cpp
  117. +4 −3 xbmc/filesystem/SMBDirectory.cpp
  118. +104 −2 xbmc/filesystem/ZeroconfDirectory.cpp
  119. +4 −1 xbmc/filesystem/ZeroconfDirectory.h
  120. +9 −1 xbmc/guilib/GUIControlFactory.cpp
  121. +8 −6 xbmc/guilib/GUILabel.cpp
  122. +2 −1 xbmc/guilib/GUIListGroup.cpp
  123. +0 −5 xbmc/guilib/GUIMultiImage.cpp
  124. +26 −0 xbmc/guilib/GUIProgressControl.cpp
  125. +4 −0 xbmc/guilib/GUIProgressControl.h
  126. +10 −2 xbmc/guilib/GUIWindow.cpp
  127. +10 −3 xbmc/guilib/GUIWindow.h
  128. +6 −0 xbmc/guilib/GUIWindowManager.cpp
  129. +4 −0 xbmc/guilib/GUIWindowManager.h
  130. +2 −2 xbmc/guilib/GraphicContext.cpp
  131. +9 −6 xbmc/guilib/GraphicContext.h
  132. +5 −2 xbmc/guilib/Texture.cpp
  133. +29 −15 xbmc/guilib/TextureGL.cpp
  134. +2 −1 xbmc/guilib/XBTF.h
  135. +6 −0 xbmc/input/KeyboardStat.cpp
  136. +5 −0 xbmc/input/XBMC_keysym.h
  137. +180 −167 xbmc/input/XBMC_keytable.cpp
  138. +0 −5 xbmc/input/XBMC_keytable.h
  139. +173 −158 xbmc/input/XBMC_vkeys.h
  140. +4 −3 xbmc/input/linux/LIRC.cpp
  141. +6 −6 xbmc/input/windows/IRServerSuite.cpp
  142. +34 −0 xbmc/interfaces/Builtins.cpp
  143. +2 −2 xbmc/interfaces/DbusServer.cpp
  144. +3 −2 xbmc/interfaces/http-api/XBMChttp.cpp
  145. +18 −25 xbmc/interfaces/python/XBPyThread.cpp
  146. +0 −1 xbmc/interfaces/python/XBPyThread.h
  147. +3 −2 xbmc/interfaces/python/XBPython.cpp
  148. +55 −0 xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
  149. +63 −0 xbmc/interfaces/python/xbmcmodule/xbmcvfsmodule.cpp
  150. +1 −0 xbmc/linux/XEventUtils.cpp
  151. +1 −0 xbmc/linux/XHandle.cpp
  152. +3 −2 xbmc/linux/XLCDproc.cpp
  153. +9 −8 xbmc/music/LastFmManager.cpp
  154. +13 −12 xbmc/music/MusicDatabase.cpp
  155. +3 −2 xbmc/music/infoscanner/MusicInfoScanner.cpp
  156. +3 −2 xbmc/music/karaoke/karaokelyricsmanager.cpp
  157. +1 −1 xbmc/music/karaoke/karaokelyricsmanager.h
  158. +5 −4 xbmc/music/windows/GUIWindowMusicBase.cpp
  159. +2 −1 xbmc/network/EventClient.cpp
  160. +1 −2 xbmc/network/EventServer.cpp
  161. +3 −2 xbmc/network/UPnP.cpp
  162. +4 −3 xbmc/network/UdpClient.cpp
  163. +4 −0 xbmc/network/ZeroconfBrowser.cpp
  164. +0 −1 xbmc/osx/Makefile.in
  165. +0 −263 xbmc/osx/posix-realtime-stub.c
  166. +0 −58 xbmc/osx/posix-realtime-stub.h
  167. +3 −2 xbmc/pictures/GUIWindowPictures.cpp
  168. +4 −11 xbmc/pictures/GUIWindowSlideShow.cpp
  169. +76 −11 xbmc/pvr/PVRDatabase.cpp
  170. +2 −0 xbmc/pvr/PVRDatabase.h
  171. +19 −10 xbmc/pvr/PVRGUIInfo.cpp
  172. +1 −0 xbmc/pvr/PVRGUIInfo.h
  173. +60 −42 xbmc/pvr/PVRManager.cpp
  174. +14 −8 xbmc/pvr/PVRManager.h
  175. +47 −46 xbmc/pvr/addons/PVRClient.cpp
  176. +24 −15 xbmc/pvr/addons/PVRClient.h
  177. +201 −218 xbmc/pvr/addons/PVRClients.cpp
  178. +84 −42 xbmc/pvr/addons/PVRClients.h
  179. +1 −1 xbmc/pvr/channels/PVRChannel.cpp
  180. +19 −2 xbmc/pvr/channels/PVRChannelGroup.cpp
  181. +7 −0 xbmc/pvr/channels/PVRChannelGroup.h
  182. +4 −5 xbmc/pvr/channels/PVRChannelGroupsContainer.cpp
  183. +2 −2 xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
  184. +1 −1 xbmc/pvr/epg/PVREpg.cpp
  185. +3 −2 xbmc/pvr/epg/PVREpgContainer.cpp
  186. +5 −5 xbmc/pvr/recordings/PVRRecording.cpp
  187. +1 −1 xbmc/pvr/recordings/PVRRecording.h
  188. +7 −4 xbmc/pvr/recordings/PVRRecordings.cpp
  189. +24 −20 xbmc/pvr/timers/PVRTimerInfoTag.cpp
  190. +6 −0 xbmc/pvr/timers/PVRTimerInfoTag.h
  191. +28 −8 xbmc/pvr/timers/PVRTimers.cpp
  192. +1 −1 xbmc/pvr/windows/GUIWindowPVR.cpp
  193. +1 −1 xbmc/pvr/windows/GUIWindowPVRChannels.cpp
  194. +2 −2 xbmc/pvr/windows/GUIWindowPVRCommon.cpp
  195. +123 −30 xbmc/pvrclients/MediaPortal/client.cpp
  196. +10 −7 xbmc/pvrclients/MediaPortal/pvrclient-mediaportal.cpp
  197. +1 −1 xbmc/pvrclients/mythtv/client.cpp
  198. +7 −4 xbmc/pvrclients/tvheadend/HTSPData.cpp
  199. +31 −1 xbmc/pvrclients/tvheadend/client.cpp
  200. +7 −4 xbmc/pvrclients/vdr-vnsi/VNSIData.cpp
  201. +1 −1 xbmc/pvrclients/vdr-vnsi/VNSIRecording.cpp
  202. +29 −0 xbmc/pvrclients/vdr-vnsi/client.cpp
  203. +3 −3 xbmc/pvrclients/vdr-vnsi/project/VS2010Express/XBMC_VDR_vnsi.vcxproj
  204. +3 −3 xbmc/pvrclients/vdr-vnsi/project/VS2010Express/XBMC_VDR_vnsi.vcxproj.filters
  205. +2 −2 xbmc/rendering/RenderSystem.h
  206. +6 −5 xbmc/rendering/dx/RenderSystemDX.cpp
  207. +2 −2 xbmc/rendering/dx/RenderSystemDX.h
  208. +2 −2 xbmc/rendering/gl/RenderSystemGL.cpp
  209. +2 −2 xbmc/rendering/gl/RenderSystemGL.h
  210. +2 −2 xbmc/rendering/gles/RenderSystemGLES.cpp
  211. +2 −2 xbmc/rendering/gles/RenderSystemGLES.h
  212. +4 −0 xbmc/settings/AdvancedSettings.cpp
  213. +2 −0 xbmc/settings/AdvancedSettings.h
  214. +1 −1 xbmc/settings/GUIDialogContentSettings.cpp
  215. +2 −1 xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
  216. +1 −2 xbmc/storage/DetectDVDType.cpp
  217. +1 −0 xbmc/storage/DetectDVDType.h
  218. +19 −46 xbmc/threads/Condition.h
  219. +1 −82 xbmc/threads/CriticalSection.h
  220. +2 −2 xbmc/threads/Event.cpp
  221. +19 −7 xbmc/threads/Event.h
  222. +38 −0 xbmc/threads/Helpers.h
  223. +164 −0 xbmc/threads/Lockables.h
  224. +2 −1 xbmc/threads/Makefile
  225. +10 −22 xbmc/threads/SharedSection.h
  226. +6 −6 xbmc/threads/SingleLock.h
  227. +56 −0 xbmc/threads/SystemClock.cpp
  228. +65 −0 xbmc/threads/SystemClock.h
  229. +11 −11 xbmc/threads/Thread.cpp
  230. +6 −4 xbmc/threads/Thread.h
  231. +20 −40 xbmc/threads/ThreadLocal.h
  232. +31 −0 xbmc/threads/platform/Condition.h
  233. +30 −0 xbmc/threads/platform/CriticalSection.h
  234. +28 −0 xbmc/threads/platform/Implementation.cpp
  235. +52 −0 xbmc/threads/platform/README.platform
  236. +30 −0 xbmc/threads/platform/ThreadLocal.h
  237. +47 −0 xbmc/threads/platform/platform.select.h
  238. +86 −0 xbmc/threads/platform/pthreads/Condition.h
  239. +68 −0 xbmc/threads/platform/pthreads/CriticalSection.h
  240. +58 −0 xbmc/threads/platform/pthreads/Implementation.cpp
  241. +45 −0 xbmc/threads/platform/pthreads/ThreadLocal.h
  242. +80 −0 xbmc/threads/platform/win/Condition.h
  243. +80 −0 xbmc/threads/platform/win/CriticalSection.h
  244. +20 −2 xbmc/threads/{ThreadLocal.cpp → platform/win/ThreadLocal.h}
  245. +2 −1 xbmc/threads/test/Makefile
  246. +99 −50 xbmc/threads/test/TestEvent.cpp
  247. +64 −0 xbmc/threads/test/TestHelpers.h
  248. +104 −19 xbmc/threads/test/TestSharedSection.cpp
  249. +170 −0 xbmc/threads/test/TestThreadLocal.cpp
  250. +3 −2 xbmc/utils/AsyncFileCopy.cpp
  251. +14 −1 xbmc/utils/CPUInfo.cpp
  252. +1 −2 xbmc/utils/JobManager.cpp
  253. +2 −0 xbmc/utils/LCD.cpp
  254. +6 −1 xbmc/utils/LCD.h
  255. +53 −1 xbmc/utils/MathUtils.h
  256. +3 −2 xbmc/utils/RssReader.cpp
  257. +2 −1 xbmc/utils/Splash.cpp
  258. +2 −1 xbmc/utils/Stopwatch.cpp
  259. +3 −2 xbmc/utils/SystemInfo.cpp
  260. +15 −40 xbmc/utils/TimeUtils.cpp
  261. +0 −1 xbmc/utils/TimeUtils.h
  262. +8 −0 xbmc/utils/XMLUtils.cpp
  263. +1 −0 xbmc/utils/XMLUtils.h
  264. +7 −0 xbmc/video/GUIViewStateVideo.cpp
  265. +4 −3 xbmc/video/Teletext.cpp
  266. +24 −23 xbmc/video/VideoDatabase.cpp
  267. +3 −2 xbmc/video/VideoInfoScanner.cpp
  268. +5 −4 xbmc/video/windows/GUIWindowFullScreen.cpp
  269. +59 −0 xbmc/win32/WIN32Util.cpp
  270. +2 −0 xbmc/win32/WIN32Util.h
  271. +1 −1 xbmc/windowing/X11/WinSystemX11GL.cpp
  272. +1 −1 xbmc/windowing/X11/WinSystemX11GL.h
  273. +1 −1 xbmc/windowing/egl/WinSystemEGL.cpp
  274. +1 −1 xbmc/windowing/egl/WinSystemEGL.h
  275. +1 −1 xbmc/windowing/osx/WinSystemIOS.h
  276. +1 −1 xbmc/windowing/osx/WinSystemIOS.mm
  277. +1 −1 xbmc/windowing/osx/WinSystemOSXGL.h
  278. +1 −1 xbmc/windowing/osx/WinSystemOSXGL.mm
  279. +6 −0 xbmc/windowing/windows/WinEventsWin32.cpp
  280. +3 −2 xbmc/windows/GUIMediaWindow.cpp
  281. +48 −3 xbmc/windows/GUIWindowHome.cpp
  282. +7 −1 xbmc/windows/GUIWindowHome.h
View
@@ -322,20 +322,12 @@ lib/cmyth/Makefile
/project/obj
/project/output
-# /project/Win32BuildSetup/dependencies
-/project/Win32BuildSetup/dependencies/SDL.dll
-/project/Win32BuildSetup/dependencies/glew32.dll
-/project/Win32BuildSetup/dependencies/pcre.dll
-/project/Win32BuildSetup/dependencies/pcrecpp.dll
-/project/Win32BuildSetup/dependencies/python26.dll
-/project/Win32BuildSetup/dependencies/libcdio-12.dll
-/project/Win32BuildSetup/dependencies/vcredist
-
# /project/Win32BuildSetup/
/project/Win32BuildSetup/BuildLog.htm
/project/Win32BuildSetup/XBMCSetup*.exe
/project/Win32BuildSetup/languages.nsi
/project/Win32BuildSetup/BUILD_WIN32/
+/project/Win32BuildSetup/dependencies
# /project/BuildDependencies
/project/BuildDependencies/downloads
@@ -482,6 +474,7 @@ lib/cmyth/Makefile
/tools/EventClients/*.pyc
/tools/EventClients/Clients/OSXRemote/Makefile
/tools/EventClients/Clients/OSXRemote/build/
+/tools/EventClients/Clients/WiiRemote/WiiRemote
# /tools/Linux/
/tools/Linux/xbmc.sh
@@ -1032,6 +1025,7 @@ lib/cmyth/Makefile
/lib/libapetag/m4/ltoptions.m4
/lib/libapetag/m4/ltsugar.m4
/lib/libapetag/m4/ltversion.m4
+/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/Makefile.in
/lib/libapetag/missing
View
@@ -112,6 +112,15 @@ DVDPCODECS_DIRS= \
lib \
lib/libdvd \
+DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
+ xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
+ xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
+ xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
+ xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
+ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
+ xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
+ xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \
+
PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
@@ -122,7 +131,7 @@ PAPCODECS_DIRS= \
lib/vgmstream \
ifeq (@USE_ASAP_CODEC@,1)
-PAPCODEC_DIRS+= \
+PAPCODECS_DIRS+= \
lib/asap
endif
@@ -136,8 +145,10 @@ LIB_DIRS=\
lib/cpluff \
lib/xbmc-dll-symbols
-SS_DIRS=\
- xbmc/screensavers/rsxs-0.9/xbmc
+SS_DIRS=
+ifeq (@USE_OPENGL@,1)
+SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
+endif
VIS_DIRS=
ifeq (@USE_OPENGL@,1)
@@ -233,22 +244,8 @@ xbmc/cores/DllLoader/exports/exports.a: force
$(MAKE) -C xbmc/cores/DllLoader/exports
xbmc/cores/DllLoader/exports/util/exports_utils.a: force
$(MAKE) -C xbmc/cores/DllLoader/exports/util
-xbmc/cores/dvdplayer/DVDPlayer.a: force
- $(MAKE) -C xbmc/cores/dvdplayer
-xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs
-xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Audio
-xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Overlay
-xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video
-xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDDemuxers
-xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDInputStreams
-xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a: force
- $(MAKE) -C xbmc/cores/dvdplayer/DVDSubtitles
+$(DVDPLAYER_ARCHIVES): force dvdpcodecs
+ $(MAKE) -C $(@D)
xbmc/cores/paplayer/paplayer.a: force papcodecs
$(MAKE) -C xbmc/cores/paplayer
xbmc/cores/AudioRenderers/audiorenderers.a: force
@@ -410,23 +407,22 @@ endif
lib/xbmc-dll-symbols/dll-symbols.a: force
$(MAKE) -C lib/xbmc-dll-symbols
-exports:
- $(MAKE) xbmc/cores/DllLoader/exports/exports.a
- $(MAKE) xbmc/cores/DllLoader/exports/util/exports_utils.a
+exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a
$(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
-dllloader: exports
- $(MAKE) xbmc/cores/DllLoader/dllloader.a
-visualizations: exports
- for d in $(VIS_DIRS); do $(MAKE) -C $$d; done
+dllloader: exports xbmc/cores/DllLoader/dllloader.a
+
+$(VIS_DIRS) $(SS_DIRS): force exports
+ $(MAKE) -C $@
+
+visualizations: $(VIS_DIRS)
+
+screensavers: $(SS_DIRS)
+
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
-ifeq (@USE_OPENGL@,1)
- $(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
-endif
libaddon: exports
$(MAKE) -C lib/addons/library.xbmc.addon
$(MAKE) -C lib/addons/library.xbmc.gui
@@ -491,21 +487,14 @@ OBJSXBMC= \
xbmc/xbmc.a \
xbmc/addons/addons.a \
xbmc/cores/playercorefactory/playercorefactory.a \
- xbmc/cores/dvdplayer/DVDPlayer.a \
xbmc/cores/paplayer/paplayer.a \
xbmc/cores/VideoRenderers/VideoRenderer.a \
xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
lib/tinyXML/tinyxml.a \
xbmc/cores/cores.a \
xbmc/interfaces/python/python.a \
xbmc/cores/DllLoader/dllloader.a \
- xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
- xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
- xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
- xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
- xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
- xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \
+ $(DVDPLAYER_ARCHIVES) \
xbmc/cores/AudioRenderers/audiorenderers.a \
xbmc/cores/ExternalPlayer/ExternalPlayer.a \
xbmc/epg/epg.a \
View
@@ -66,67 +66,59 @@ ifneq ($(V), 1)
SILENT_AR =@echo "AR $@";
endif
+OBJS+=$(filter %.o,$(SRCS:.cpp=.o))
+OBJS+=$(filter %.o,$(SRCS:.c=.o))
+OBJS+=$(filter %.o,$(SRCS:.S=.o))
+OBJS+=$(filter %.o,$(SRCS:.mm=.o))
+OBJS+=$(filter %.o,$(SRCS:.m=.o))
+
+DEPS+=$(filter %.P,$(OBJS:.o=.P))
+
+GEN_DEPS=\
+ cp $*.d $*.P \
+ && sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P \
+ && rm -f $*.d \
+ || ( rm -f $*.P $@ && exit 1 )
+
+%.o: %.cpp
+ @rm -f $@
+ $(SILENT_CPP) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
+
+%.o: %.cc
+ @rm -f $@
+ $(SILENT_CC) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
+
+%.o: %.c
+ @rm -f $@
+ $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
+
+%.o: %.C
+ @rm -f $@
+ $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
+
+%.o: %.S
+ @rm -f $@
+ $(SILENT_CC) $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
-.cpp.o:
- @rm -f ${<:.cpp=.o}
- $(SILENT_CPP) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
-
-.cc.o:
- @rm -f ${<:.cc=.o}
- $(SILENT_CC) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cc=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
-
-.c.o:
- @rm -f ${<:.c=.o}
- $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
-
-.C.o:
- @rm -f ${<:.C=.o}
- $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.C=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
-
-.S.o:
- @rm -f ${<:.S=.o}
- $(SILENT_CC) $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.S=.o}
%.h.gch : %.h
$(SILENT_GCH) $(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
-.m.o:
- @rm -f ${<:.m=.o}
- $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.m=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
-
-.mm.o:
- @rm -f ${<:.mm=.o}
- $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.mm=.o}
- @cp $*.d $*.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
- rm -f $*.d
+%.o: %.m
+ @rm -f $@
+ $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
+
+%.o: %.mm
+ @rm -f $@
+ $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ && $(GEN_DEPS)
-OBJS+=$(filter %.o,$(SRCS:.cpp=.o))
-OBJS+=$(filter %.o,$(SRCS:.c=.o))
-OBJS+=$(filter %.o,$(SRCS:.S=.o))
-OBJS+=$(filter %.o,$(SRCS:.mm=.o))
-OBJS+=$(filter %.o,$(SRCS:.m=.o))
.PHONY : lib pch clean distclean distclean_evil
@@ -137,11 +129,11 @@ pch: $(PCH:.h=.h.gch)
for d in $(DIRS); do (cd "$$d"; $(MAKE) pch ); done
clean:
- $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(CLEAN_FILES) $(PCH:.h=.h.gch) $(OBJS:.o=.P)
+ $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(CLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)
for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" clean); fi ); done
distclean:
- $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(OBJS:.o=.P)
+ $(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)
for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" distclean || $(MAKE) -C "$$d" clean); fi ); done
if [ "$(shell pwd -P)" = "$(abs_top_srcdir)" ] || \
[ "$(shell pwd)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi
Oops, something went wrong.

0 comments on commit 60222aa

Please sign in to comment.