From 85cb3f04252b0228830903b21c08bb64e9919c18 Mon Sep 17 00:00:00 2001 From: geronimo Date: Sun, 29 Jul 2012 15:11:47 +0200 Subject: changed server setup to config file, little rearrangement of sources --- libs/vdr/nbproject/Makefile-Debug.mk | 4 ++-- libs/vdr/nbproject/configurations.xml | 4 ++-- libs/vdr/nbproject/private/configurations.xml | 2 +- libs/vdr/src/i18n.cc | 16 +++++++------- libs/vdr/vdr.cbp | 6 +++--- libs/vdr/vdr.layout | 30 ++++++++++++++++++--------- libs/vdr/vdr.layout.save | 26 ++++++++++++++++------- 7 files changed, 54 insertions(+), 34 deletions(-) (limited to 'libs/vdr') diff --git a/libs/vdr/nbproject/Makefile-Debug.mk b/libs/vdr/nbproject/Makefile-Debug.mk index 18c336e..e32e3d1 100644 --- a/libs/vdr/nbproject/Makefile-Debug.mk +++ b/libs/vdr/nbproject/Makefile-Debug.mk @@ -52,8 +52,8 @@ OBJECTFILES= \ CFLAGS= # CC Compiler Flags -CCFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi -CXXFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi +CCFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration +CXXFLAGS=-std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration # Fortran Compiler Flags FFLAGS= diff --git a/libs/vdr/nbproject/configurations.xml b/libs/vdr/nbproject/configurations.xml index 10a1566..8ab8f02 100644 --- a/libs/vdr/nbproject/configurations.xml +++ b/libs/vdr/nbproject/configurations.xml @@ -1,5 +1,5 @@ - + /usr/include/freetype2 /usr/include/fribidi - -std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -ansi + -std=gnu++0x -fomit-frame-pointer -fPIC -pthread -Wall -Wno-parentheses -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration LOCDIR=/usr/share/locale _GNU_SOURCE=1 diff --git a/libs/vdr/nbproject/private/configurations.xml b/libs/vdr/nbproject/private/configurations.xml index fa15dc7..616cc91 100644 --- a/libs/vdr/nbproject/private/configurations.xml +++ b/libs/vdr/nbproject/private/configurations.xml @@ -1,5 +1,5 @@ - + Makefile diff --git a/libs/vdr/src/i18n.cc b/libs/vdr/src/i18n.cc index a6d8d65..a493714 100644 --- a/libs/vdr/src/i18n.cc +++ b/libs/vdr/src/i18n.cc @@ -1,30 +1,30 @@ /** * File: i18n.cc * Project: libvdr - classes taken from vdr-project - * + * * from "Video Disk Recorder": - * + * * Copyright (C) 2000, 2003, 2006, 2008 Klaus Schmidinger - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * + * * The original author can be reached at kls@tvdr.de - * + * * The vdr project's page is at http://www.tvdr.de - * + * * In case an English phrase is used in more than one context (and might need * different translations in other languages) it can be preceded with an * arbitrary string to describe its context, separated from the actual phrase diff --git a/libs/vdr/vdr.cbp b/libs/vdr/vdr.cbp index 82be645..7c05ab5 100644 --- a/libs/vdr/vdr.cbp +++ b/libs/vdr/vdr.cbp @@ -7,7 +7,7 @@