Merge pull request xbmc#1782 from davilla/fix-osx-incudes

[osx] fixed borked include paths, osx matches command-line make now
pieh · Nov 15, 2012 · 288715f · 288715f
2 parents 134374d + db96f20
commit 288715f
Show file tree

Hide file tree

Showing 33 changed files with 108 additions and 112 deletions.
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
diff --git a/lib/libhts/htsstr.c b/lib/libhts/htsstr.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef __APPLE__
-#include "OSXGNUReplacements.h"
+#include "osx/OSXGNUReplacements.h"
 #elif defined(_MSC_VER)
 #include "msvc.h"
 #endif

diff --git a/lib/libhts/net_posix.c b/lib/libhts/net_posix.c
@@ -23,7 +23,7 @@
 #ifndef SOL_TCP
 #define SOL_TCP IPPROTO_TCP
 #endif
-#include "OSXGNUReplacements.h"
+#include "osx/OSXGNUReplacements.h"
 #elif defined(__FreeBSD__)
 #ifndef SOL_TCP
 #define SOL_TCP IPPROTO_TCP

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -295,11 +295,11 @@
 #endif
 
 #ifdef TARGET_DARWIN_OSX
-#include "CocoaInterface.h"
-#include "XBMCHelper.h"
+#include "osx/CocoaInterface.h"
+#include "osx/XBMCHelper.h"
 #endif
 #ifdef TARGET_DARWIN
-#include "DarwinUtils.h"
+#include "osx/DarwinUtils.h"
 #endif
 
 

diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
@@ -50,7 +50,7 @@
 #include "WIN32Util.h"
 #define CHalManager CWIN32Util
 #elif defined(TARGET_DARWIN)
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #endif
 #include "addons/AddonCallbacks.h"
 #include "addons/AddonCallbacksGUI.h"

diff --git a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp
@@ -22,7 +22,7 @@
 #define DTS_ENCODE_BITRATE 1411200
 
 #include "AEEncoderFFmpeg.h"
-#include "Utils/AEUtil.h"
+#include "cores/AudioEngine/Utils/AEUtil.h"
 #include "utils/log.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/GUISettings.h"

diff --git a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
@@ -19,9 +19,9 @@
  *
  */
 
-#include "Interfaces/AEEncoder.h"
-#include "Utils/AERemap.h"
-#include "Utils/AEPackIEC61937.h"
+#include "cores/AudioEngine/Interfaces/AEEncoder.h"
+#include "cores/AudioEngine/Utils/AERemap.h"
+#include "cores/AudioEngine/Utils/AEPackIEC61937.h"
 
 /* ffmpeg re-defines this, so undef it to squash the warning */
 #undef restrict

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp
@@ -22,7 +22,6 @@
 
 #include "CoreAudioAE.h"
 
-#include "MathUtils.h"
 #include "CoreAudioAEStream.h"
 #include "CoreAudioAESound.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
@@ -33,6 +32,7 @@
 #include "utils/EndianSwap.h"
 #include "utils/log.h"
 #include "utils/TimeUtils.h"
+#include "utils/MathUtils.h"
 
 #define DELAY_FRAME_TIME  20
 #define BUFFERSIZE        16416

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h
@@ -24,7 +24,7 @@
 
 #include "system.h"
 
-#include "Interfaces/AE.h"
+#include "cores/AudioEngine/Interfaces/AE.h"
 #include "ICoreAudioAEHAL.h"
 #include "ICoreAudioSource.h"
 #include "CoreAudioAEStream.h"

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.cpp
@@ -22,11 +22,11 @@
 
 #include "CoreAudioAESound.h"
 
-#include "AEFactory.h"
-#include "AEAudioFormat.h"
 #include "CoreAudioAE.h"
-#include "Interfaces/AESound.h"
 #include "threads/SingleLock.h"
+#include "cores/AudioEngine/AEFactory.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Interfaces/AESound.h"
 #include "cores/AudioEngine/Utils/AEConvert.h"
 #include "cores/AudioEngine/Utils/AERemap.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.h
@@ -19,9 +19,9 @@
  *
  */
 
-#include "Interfaces/AESound.h"
+#include "cores/AudioEngine/Interfaces/AESound.h"
+#include "cores/AudioEngine/Utils/AEWAVLoader.h"
 #include "threads/CriticalSection.h"
-#include "Utils/AEWAVLoader.h"
 
 class CCoreAudioAESound : public IAESound
 {

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEStream.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEStream.h
@@ -22,10 +22,10 @@
 #include <samplerate.h>
 #include <list>
 
-#include "AEAudioFormat.h"
 #include "CoreAudioRingBuffer.h"
 #include "ICoreAudioSource.h"
-#include "Interfaces/AEStream.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Interfaces/AEStream.h"
 #include "cores/AudioEngine/Utils/AEConvert.h"
 #include "cores/AudioEngine/Utils/AERemap.h"
 

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.h
@@ -23,7 +23,7 @@
 
 #if defined(TARGET_DARWIN_OSX)
 
-#include "AEAudioFormat.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
 
 #include <CoreAudio/CoreAudio.h>
 

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioAEHAL.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioAEHAL.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "AEAudioFormat.h"
-#include "Interfaces/AE.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Interfaces/AE.h"
 #include "ICoreAudioSource.h"
 
 class ICoreAudioAEHAL;

diff --git a/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h b/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h
@@ -20,7 +20,7 @@
  */
 
 #include "DllAvCodec.h"
-#include "AEAudioFormat.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
 
 /**
  * IAEEncoder interface for on the fly audio compression

diff --git a/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h b/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h
@@ -21,8 +21,8 @@
 
 #include <string>
 #include <vector>
-#include "AEAudioFormat.h"
-#include "Utils/AEChannelInfo.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEChannelInfo.h"
 
 typedef std::vector<unsigned int     > AESampleRateList;
 typedef std::vector<enum AEDataFormat> AEDataFormatList;

diff --git a/xbmc/cores/AudioEngine/Utils/AERemap.cpp b/xbmc/cores/AudioEngine/Utils/AERemap.cpp
@@ -21,8 +21,8 @@
 #include <sstream>
 
 #include "AERemap.h"
-#include "AEFactory.h"
-#include "AEUtil.h"
+#include "cores/AudioEngine/AEFactory.h"
+#include "cores/AudioEngine/Utils/AEUtil.h"
 #include "utils/log.h"
 #include "settings/GUISettings.h"
 

diff --git a/xbmc/cores/AudioEngine/Utils/AERemap.h b/xbmc/cores/AudioEngine/Utils/AERemap.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "AEAudioFormat.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
 
 class CAERemap {
 public:

diff --git a/xbmc/cores/AudioEngine/Utils/AEWAVLoader.h b/xbmc/cores/AudioEngine/Utils/AEWAVLoader.h
@@ -20,7 +20,7 @@
  */
 
 #include "utils/StdString.h"
-#include "AEAudioFormat.h"
+#include "cores/AudioEngine/AEAudioFormat.h"
 
 class CAEWAVLoader
 {

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -27,7 +27,7 @@
 #include "utils/log.h"
 #include "guilib/Geometry.h"
 #if defined(TARGET_DARWIN)
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #endif
 
 #define HOLDMODE_NONE 0

diff --git a/xbmc/filesystem/SAPDirectory.cpp b/xbmc/filesystem/SAPDirectory.cpp
@@ -29,7 +29,7 @@
 #include "utils/TimeUtils.h"
 #include "URL.h"
 #if defined(TARGET_DARWIN)
-#include "OSXGNUReplacements.h" // strnlen
+#include "osx/OSXGNUReplacements.h" // strnlen
 #endif
 #ifdef __FreeBSD__
 #include "freebsd/FreeBSDGNUReplacements.h"

diff --git a/xbmc/guilib/GUIEditControl.cpp b/xbmc/guilib/GUIEditControl.cpp
@@ -29,7 +29,7 @@
 #include "utils/md5.h"
 
 #if defined(TARGET_DARWIN)
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #endif
 
 const char* CGUIEditControl::smsLetters[10] = { " !@#$%^&*()[]{}<>/\\|0", ".,;:\'\"-+_=?`~1", "abc2", "def3", "ghi4", "jkl5", "mno6", "pqrs7", "tuv8", "wxyz9" };

diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
@@ -79,7 +79,7 @@
 
 #if defined(TARGET_DARWIN)
 #include "filesystem/SpecialProtocol.h"
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #endif
 
 #ifdef HAS_CDDA_RIPPER

diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
@@ -27,7 +27,7 @@
 #include "LinuxTimezone.h"
 #include "utils/SystemInfo.h"
 #if defined(TARGET_DARWIN)
-#include "OSXGNUReplacements.h"
+#include "osx/OSXGNUReplacements.h"
 #endif
 #ifdef __FreeBSD__
 #include "freebsd/FreeBSDGNUReplacements.h"

diff --git a/xbmc/main/osx/SDLMain.mm b/xbmc/main/osx/SDLMain.mm
@@ -15,7 +15,7 @@
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
 
-#import "CocoaInterface.h"
+#import "osx/CocoaInterface.h"
 //hack around problem with xbmc's typedef int BOOL
 // and obj-c's typedef unsigned char BOOL
 #define BOOL XBMC_BOOL 
@@ -25,7 +25,7 @@
 #import "storage/osx/DarwinStorageProvider.h"
 #undef BOOL
 
-#import "HotKeyController.h"
+#import "osx/HotKeyController.h"
 
 // For some reaon, Apple removed setAppleMenu from the headers in 10.4,
 // but the method still is there and works. To avoid warnings, we declare

diff --git a/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp b/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp
@@ -38,7 +38,7 @@ typedef unsigned char BYTE;
 
 #include "osx/DarwinUtils.h"
 
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 
 #if defined(TARGET_DARWIN_OSX)
 OSStatus SendAppleEventToSystemProcess(AEEventID eventToSendID)

diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.h b/xbmc/pvr/timers/PVRTimerInfoTag.h
@@ -38,7 +38,7 @@
  */
 
 #include "XBDateTime.h"
-#include "../addons/include/xbmc_pvr_types.h"
+#include "addons/include/xbmc_pvr_types.h"
 
 #include <boost/shared_ptr.hpp>
 

diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -72,7 +72,7 @@
 #endif
 #endif
 #if defined(TARGET_DARWIN_OSX)
-#include "XBMCHelper.h"
+#include "osx/XBMCHelper.h"
 #endif
 #include "network/GUIDialogAccessPoints.h"
 #include "filesystem/Directory.h"

diff --git a/xbmc/storage/osx/DarwinStorageProvider.cpp b/xbmc/storage/osx/DarwinStorageProvider.cpp
@@ -28,7 +28,7 @@
 #if defined(TARGET_DARWIN_OSX)
 #include <DiskArbitration/DiskArbitration.h>
 #endif
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 
 bool CDarwinStorageProvider::m_event = false;
 

diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp
@@ -27,7 +27,7 @@
 #include "filesystem/File.h"
 #include "filesystem/CurlFile.h"
 #if defined(TARGET_DARWIN)
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #endif
 #include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"

diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
@@ -33,7 +33,7 @@
   #define NVSETTINGSCMD "nvidia-settings -nt -q RefreshRate3"
 #elif defined(TARGET_DARWIN_OSX)
   #include <QuartzCore/CVDisplayLink.h>
-  #include "CocoaInterface.h"
+  #include "osx/CocoaInterface.h"
 #elif defined(TARGET_DARWIN_IOS)
   #include "windowing/WindowingFactory.h"
 #elif defined(_WIN32) && defined(HAS_DX)

diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm
@@ -33,9 +33,9 @@
 #include "input/KeyboardStat.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
-#include "XBMCHelper.h"
+#include "osx/XBMCHelper.h"
 #include "utils/SystemInfo.h"
-#include "CocoaInterface.h"
+#include "osx/CocoaInterface.h"
 #undef BOOL
 
 #import <SDL/SDL_video.h>

diff --git a/xbmc/windowing/osx/WinSystemOSXGL.mm b/xbmc/windowing/osx/WinSystemOSXGL.mm
@@ -23,7 +23,7 @@
 //hack around problem with xbmc's typedef int BOOL
 // and obj-c's typedef unsigned char BOOL
 #define BOOL XBMC_BOOL
-#include "../guilib/Texture.h"
+#include "guilib/Texture.h"
 #include "WinSystemOSXGL.h"
 #include "rendering/gl/RenderSystemGL.h"
 #undef BOOL