frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Now including the optional user defined Make.config from the 'libsi' Makefile

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-05-05 11:04:18 +02:00
parent f1494502a7
commit 8775419779
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1303,6 +1303,7 @@ Roman Krenick
Ville Skyttä <ville.skytta@iki.fi> Ville Skyttä <ville.skytta@iki.fi>
for reporting several compiler warnings in gcc 4.0 for reporting several compiler warnings in gcc 4.0
for including the optional user defined Make.config from the 'libsi' Makefile
Steffen Beyer <cpunk@reactor.de> Steffen Beyer <cpunk@reactor.de>
for fixing setting the colored button help after deleting a recording in case the next for fixing setting the colored button help after deleting a recording in case the next

5
HISTORY
View File

@ -3473,3 +3473,8 @@ Video Disk Recorder Revision History
than 30 seconds. than 30 seconds.
- Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald). - Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
- All log entries regarding timers now contain a short description of the timer. - All log entries regarding timers now contain a short description of the timer.
2005-05-05: Version 1.3.24
- Now including the optional user defined Make.config from the 'libsi' Makefile
(thanks to Ville Skyttä).

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.216 2005/03/05 15:44:35 kls Exp $ * $Id: config.h 1.217 2005/05/05 11:04:18 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.23" #define VDRVERSION "1.3.24"
#define VDRVERSNUM 10323 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10324 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

4
libsi/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a libsi # Makefile for a libsi
# #
# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $ # $Id: Makefile 1.4 2005/05/05 11:01:46 kls Exp $
### The C++ compiler and options: ### The C++ compiler and options:
@ -11,6 +11,8 @@ AR = ar
ARFLAGS = ru ARFLAGS = ru
RANLIB = ranlib RANLIB = ranlib
-include ../Make.config
### The directory environment: ### The directory environment:
INCLUDES += INCLUDES +=