summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-24 15:02:05 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-07-24 15:02:05 +0000
commit523046933e5f65f9a569277a596d827a0d8c7c7a (patch)
tree8985aa6b2ebacd6cd722e4bcf2502e1d2dddc2c6 /src
parentd74d967493ad374657b2d7a6f5c8be858a7c63bc (diff)
downloadxine-lib-523046933e5f65f9a569277a596d827a0d8c7c7a.tar.gz
xine-lib-523046933e5f65f9a569277a596d827a0d8c7c7a.tar.bz2
Change DXR3 checkings. Some cosmetic changes.
CVS patchset: 339 CVS date: 2001/07/24 15:02:05
Diffstat (limited to 'src')
-rw-r--r--src/dxr3/Makefile.am4
-rw-r--r--src/dxr3/dxr3_decoder.c4
-rw-r--r--src/dxr3/video_out_dxr3.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index ae7488487..906eb1c96 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @GLOBAL_CFLAGS@ $(LINUX_INCLUDE)
+CFLAGS = @GLOBAL_CFLAGS@ $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE)
EXTRA_DIST = dxr3_decoder.c video_out_dxr3.c
@@ -19,7 +19,7 @@ xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
debug:
- @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(EM8300_INCLUDE_PATH) $(LINUX_INCLUDE)"
install-debug: debug
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 833fa8b4f..197c813c1 100644
--- a/src/dxr3/dxr3_decoder.c
+++ b/src/dxr3/dxr3_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_decoder.c,v 1.1 2001/07/20 17:28:21 ehasenle Exp $
+ * $Id: dxr3_decoder.c,v 1.2 2001/07/24 15:02:05 f1rmb Exp $
*
* dxr3 video and spu decoder plugin. Accepts the video and spu data
* from XINE and sends it directly to the corresponding dxr3 devices.
@@ -32,7 +32,7 @@
#include <buffer.h>
#include <xine_internal.h>
#include <linux/soundcard.h>
-#include <linux/em8300.h>
+#include <em8300.h>
#include <stdio.h>
#include <errno.h>
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index af1a36b1b..ac7bc7934 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_dxr3.c,v 1.2 2001/07/24 13:26:18 ehasenle Exp $
+ * $Id: video_out_dxr3.c,v 1.3 2001/07/24 15:02:05 f1rmb Exp $
*
* Dummy video out plugin for the dxr3. Is responsible for setting
* tv_mode, bcs values and the aspectratio.
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <errno.h>
-#include <linux/em8300.h>
+#include <em8300.h>
#include "video_out.h"
#include <pthread.h>