summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--INSTALL4
-rw-r--r--Make.config.template8
3 files changed, 13 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 9a0ba463..efc81c6b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7294,3 +7294,5 @@ Video Disk Recorder Revision History
Münster).
- Added including the Make.global and Make.config files to the dvbdhffdevice's
libhdffcmd/Makefile.
+- Added options to build a 32-bit version of VDR on a 64-bit machine to
+ Make.config.template.
diff --git a/INSTALL b/INSTALL
index 07a5079f..1767451f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -36,6 +36,10 @@ and type 'make'. This should produce an executable file
named 'vdr', which can be run after the DVB driver has been
installed.
+If you want to build a 32-bit version of VDR on a 64-bit machine, you can
+use 'make M32=1' to do so. Note that you also need to have a Make.config file
+(derived from Make.config.template) to make this work.
+
IMPORTANT: See "Configuration files" below for information on how
========= to set up the configuration files at the proper location!
diff --git a/Make.config.template b/Make.config.template
index ef463b13..08f9ece8 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Make.config.template 2.9 2012/09/01 10:31:33 kls Exp $
+# $Id: Make.config.template 2.10 2012/10/09 10:32:32 kls Exp $
### The C compiler and options:
@@ -21,6 +21,12 @@ CFLAGS += -fPIC
CXXFLAGS += -fPIC
endif
+# Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
+ifdef M32
+CFLAGS += -m32
+CXXFLAGS += -m32
+endif
+
### The directory environment:
PREFIX = $(DESTDIR)/usr/local