summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscop <scop>2005-03-19 21:50:51 +0000
committerscop <scop>2005-03-19 21:50:51 +0000
commit84a4c6a91374b990f90cfafc8213305079e588b2 (patch)
tree53b71bdf569ee9048ce48b43cae494b72161ade8
parent8bf28ea333724bf5024df60117dbeec512001f99 (diff)
downloadvdr-plugin-dxr3-84a4c6a91374b990f90cfafc8213305079e588b2.tar.gz
vdr-plugin-dxr3-84a4c6a91374b990f90cfafc8213305079e588b2.tar.bz2
Sync dir environment from HEAD.
-rw-r--r--HISTORY1
-rw-r--r--Makefile17
2 files changed, 6 insertions, 12 deletions
diff --git a/HISTORY b/HISTORY
index 3933b8d..04cc7e3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -247,6 +247,7 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
- made log dir configurable in Makefile (Christian Gmeiner, Martin Dauskardt)
You may also want to search and remove files called "dxr3plugin.log" as the
old plugin wrote them into the current working directory.
+- better default directories in Makefile (Christian Gmeiner, vdr-wiki.de folks)
- extended cDxr3MemcpyBench::Rdtsc(uint32_t config_flags): support for
non-x86 archs, support for cpu's, which dont support rdtsc timing
(Christian Gmeiner)
diff --git a/Makefile b/Makefile
index de708ba..e4f03bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.1.2.7 2005/03/14 22:21:07 scop Exp $
+# $Id: Makefile,v 1.1.2.8 2005/03/19 21:50:51 scop Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -20,18 +20,11 @@ CXXFLAGS = -O2 -Wall -Woverloaded-virtual
### The directory environment:
-##DVBDIR = ../../../../DVB
-##VDRDIR = ../../..
-##LIBDIR = ../../lib
-##TMPDIR = /tmp
-##FFMDIR = ../../../../ffmpeg
-### LIBMP3DIR = /usr/lib
-
-DVBDIR = /usr/src/linux
-VDRDIR = /usr/include/vdr
-LIBDIR = /usr/lib
+DVBDIR = ../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
TMPDIR = /tmp
-FFMDIR = /usr/include/ffmpeg
+FFMDIR = /usr/local/include/ffmpeg
EM8300 = /usr/include
### Allow user defined options to overwrite defaults: