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

configure: remove linker hacks, now that libstb-hal is fixed

Browse Source
This commit is contained in:
Stefan Seyfried
2013-06-01 13:56:41 +02:00
parent da79e3b205
commit 862fb0aada
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -61,10 +61,6 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
if test x$BOXTYPE = xgeneric; then
# needed by libstb-hal's cVideo / GLFramebuffer
TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
fi
# either use dynamic lualib in package lua (openSUSE) # either use dynamic lualib in package lua (openSUSE)
# ... or in package lua5.2 (debian-derivates) # ... or in package lua5.2 (debian-derivates)

15
src/Makefile.am
View File

@@ -132,22 +132,13 @@ neutrino_LDADD += \
neutrino_LDFLAGS = \ neutrino_LDFLAGS = \
-L$(STB_HAL_LIB) -L$(STB_HAL_LIB)
endif endif
if BOXTYPE_GENERIC
neutrino_LDADD += \
-lglut -lGL -lGLU -lGLEW -lao
endif
if BOXTYPE_SPARK
neutrino_LDADD += \
-lass
endif
if BOXTYPE_TRIPLE if BOXTYPE_TRIPLE
neutrino_LDADD += \ neutrino_LDADD += \
$(top_builddir)/src/lcddisplay/liblcddisplay.a \ $(top_builddir)/src/lcddisplay/liblcddisplay.a
@DIRECTFB_LIBS@
endif endif
neutrino_LDADD += \ neutrino_LDADD += \
@AVFORMAT_LIBS@ \ @AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \ @AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \ @AVCODEC_LIBS@
@SWSCALE_LIBS@