mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix git build

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@539 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-04-08 13:09:08 +00:00
parent ce744400e0
commit adc62e8ebe
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/Makefile.am
View File

@@ -1,8 +1,14 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions AM_CPPFLAGS = -fno-rtti -fno-exceptions
#AM_CPPFLAGS = -fno-rtti #AM_CPPFLAGS = -fno-rtti
BUILT_SOURCES = svn_version.h
svn_version.h: svn_version.h:
sleep 30 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h @if test -d .svn ; then \
sleep 180 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h ; \
else \
sleep 180 && rm svn_version.h & echo '#define BUILT_DATE "'`date`'"' > svn_version.h ; \
fi
noinst_HEADERS = svn_version.h noinst_HEADERS = svn_version.h
@@ -25,14 +31,14 @@ INCLUDES = \
noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a
libneutrino_gui_a_SOURCES = \ libneutrino_gui_a_SOURCES = \
bouquetlist.cpp channellist.cpp eventlist.cpp pluginlist.cpp \ imageinfo.cpp bouquetlist.cpp channellist.cpp eventlist.cpp pluginlist.cpp \
favorites.cpp sleeptimer.cpp screensetup.cpp \ favorites.cpp sleeptimer.cpp screensetup.cpp \
epgview.cpp infoviewer.cpp scan.cpp update.cpp \ epgview.cpp infoviewer.cpp scan.cpp update.cpp \
filebrowser.cpp audioplayer.cpp nfs.cpp pictureviewer.cpp \ filebrowser.cpp audioplayer.cpp nfs.cpp pictureviewer.cpp \
movieplayer.cpp rc_lock.cpp bookmarkmanager.cpp \ movieplayer.cpp rc_lock.cpp bookmarkmanager.cpp \
timeosd.cpp epgplus.cpp epg_menu.cpp \ timeosd.cpp epgplus.cpp epg_menu.cpp \
streaminfo2.cpp dboxinfo.cpp \ streaminfo2.cpp dboxinfo.cpp \
plugins.cpp imageinfo.cpp audio_select.cpp moviebrowser.cpp movieinfo.cpp plugins.cpp audio_select.cpp moviebrowser.cpp movieinfo.cpp
libneutrino_gui2_a_SOURCES = \ libneutrino_gui2_a_SOURCES = \
color.cpp alphasetup.cpp motorcontrol.cpp hdd_menu.cpp cam_menu.cpp infoclock.cpp upnpbrowser.cpp color.cpp alphasetup.cpp motorcontrol.cpp hdd_menu.cpp cam_menu.cpp infoclock.cpp upnpbrowser.cpp

11
src/gui/imageinfo.cpp
View File

@@ -39,6 +39,7 @@
#include "svn_version.h" #include "svn_version.h"
#define SVN_REV "SVN Rev.:" #define SVN_REV "SVN Rev.:"
#define GIT_REV "GIT Build:"
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -89,7 +90,11 @@ void CImageInfo::Init(void)
offset = tmpoffset; offset = tmpoffset;
} }
} }
#ifdef SVNVERSION
int off_tmp = g_Font[font_info]->getRenderWidth(SVN_REV); int off_tmp = g_Font[font_info]->getRenderWidth(SVN_REV);
#else
int off_tmp = g_Font[font_info]->getRenderWidth(GIT_REV);
#endif
if(off_tmp > offset) if(off_tmp > offset)
offset = off_tmp; offset = off_tmp;
@@ -207,9 +212,13 @@ void CImageInfo::paint()
paintLine(xpos+offset, font_info, releaseCycle); paintLine(xpos+offset, font_info, releaseCycle);
ypos += iheight; ypos += iheight;
#ifdef SVNVERSION
paintLine(xpos , font_info, SVN_REV); paintLine(xpos , font_info, SVN_REV);
paintLine(xpos+offset, font_info, SVNVERSION ); paintLine(xpos+offset, font_info, SVNVERSION );
#else
paintLine(xpos , font_info, GIT_REV);
paintLine(xpos+offset, font_info, BUILT_DATE );
#endif
ypos += iheight; ypos += iheight;
paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR)); paintLine(xpos , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR));
paintLine(xpos+offset, font_info, creator); paintLine(xpos+offset, font_info, creator);