mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 18:42:12 +08:00
131 lines
3.7 KiB
Diff
131 lines
3.7 KiB
Diff
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
|
index 9097519..9b6418d 100644
|
|
--- a/xbmc/Application.cpp
|
|
+++ b/xbmc/Application.cpp
|
|
@@ -236,7 +236,11 @@
|
|
#endif
|
|
|
|
#ifdef HAS_DVD_DRIVE
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/logging.h"
|
|
+#else
|
|
+#include <cdio/logging.h>
|
|
+#endif
|
|
#endif
|
|
|
|
#ifdef HAS_HAL
|
|
diff --git a/xbmc/FileSystem/Makefile b/xbmc/FileSystem/Makefile
|
|
index 782d57a..1e524ed 100644
|
|
--- a/xbmc/FileSystem/Makefile
|
|
+++ b/xbmc/FileSystem/Makefile
|
|
@@ -1,5 +1,4 @@
|
|
-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
|
|
-INCLUDES+=-I../lib/libcdio/libcdio/include
|
|
+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
|
|
|
|
CXXFLAGS+=-D__STDC_FORMAT_MACROS \
|
|
|
|
diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
|
|
index 00e5fdd..21a0b67 100644
|
|
--- a/xbmc/FileSystem/cdioSupport.cpp
|
|
+++ b/xbmc/FileSystem/cdioSupport.cpp
|
|
@@ -26,7 +26,7 @@
|
|
#include "cdioSupport.h"
|
|
#include "utils/SingleLock.h"
|
|
#include "utils/log.h"
|
|
-#ifndef _LINUX
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/logging.h"
|
|
#include "lib/libcdio/util.h"
|
|
#include "lib/libcdio/mmc.h"
|
|
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
|
|
index 6e1633f..58fbc50 100644
|
|
--- a/xbmc/FileSystem/iso9660.cpp
|
|
+++ b/xbmc/FileSystem/iso9660.cpp
|
|
@@ -44,7 +44,7 @@ ISO9660
|
|
#include "utils/CharsetConverter.h"
|
|
|
|
#include "DetectDVDType.h" // for MODE2_DATA_SIZE etc.
|
|
-#ifdef _LINUX
|
|
+#ifndef _WIN32
|
|
#include <cdio/bytesex.h>
|
|
#else
|
|
#include "lib/libcdio/bytesex.h" // for from_723 & from_733
|
|
diff --git a/xbmc/Makefile b/xbmc/Makefile
|
|
index abfbdcb..f55381a 100644
|
|
--- a/xbmc/Makefile
|
|
+++ b/xbmc/Makefile
|
|
@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
|
|
-Ilib/libUPnP/Neptune/Source/System/Posix \
|
|
-Ilib/libUPnP/Neptune/Source/Core
|
|
|
|
-INCLUDES+=-Ilib/libcdio/libcdio/include
|
|
-
|
|
SRCS=Application.cpp \
|
|
CueDocument.cpp \
|
|
GUISettings.cpp \
|
|
diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
|
|
index c8b37b2..e3e9c0b 100644
|
|
--- a/xbmc/cdrip/CDDAReader.cpp
|
|
+++ b/xbmc/cdrip/CDDAReader.cpp
|
|
@@ -24,7 +24,11 @@
|
|
#ifdef HAS_CDDA_RIPPER
|
|
|
|
#include "CDDAReader.h"
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/cdio.h"
|
|
+#else
|
|
+#include <cdio/cdio.h>
|
|
+#endif
|
|
#include "utils/log.h"
|
|
|
|
#define SECTOR_COUNT 52
|
|
diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
|
|
index 20cded7..f2a077a 100644
|
|
--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
|
|
+++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
|
|
@@ -22,7 +22,11 @@
|
|
#include "system.h"
|
|
#include "AC3CDDACodec.h"
|
|
#ifdef HAS_AC3_CDDA_CODEC
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/sector.h"
|
|
+#else
|
|
+#include <cdio/sector.h>
|
|
+#endif
|
|
|
|
AC3CDDACodec::AC3CDDACodec() : AC3Codec()
|
|
{
|
|
diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
|
|
index ca8f1be..42460dc 100644
|
|
--- a/xbmc/cores/paplayer/CDDAcodec.cpp
|
|
+++ b/xbmc/cores/paplayer/CDDAcodec.cpp
|
|
@@ -20,7 +20,11 @@
|
|
*/
|
|
|
|
#include "CDDAcodec.h"
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/sector.h"
|
|
+#else
|
|
+#include <cdio/sector.h>
|
|
+#endif
|
|
|
|
#define SECTOR_COUNT 55 // max. sectors that can be read at once
|
|
#define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
|
|
diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
|
|
index e64cc2e..9bc46c6 100644
|
|
--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
|
|
+++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
|
|
@@ -22,7 +22,11 @@
|
|
#include "system.h"
|
|
#include "DTSCDDACodec.h"
|
|
#ifdef HAS_DTS_CODEC
|
|
+#ifdef _WIN32
|
|
#include "lib/libcdio/sector.h"
|
|
+#else
|
|
+#include <cdio/sector.h>
|
|
+#endif
|
|
|
|
DTSCDDACodec::DTSCDDACodec() : DTSCodec()
|
|
{
|