git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)
[enigma2.git]
/
lib
/
gdi
/
Makefile.am
diff --git
a/lib/gdi/Makefile.am
b/lib/gdi/Makefile.am
index febbab226e1ede648b0c43ccd6bb59f36c9275ae..20321f53c0edcd96788367ec367b44bf079ea971 100644
(file)
--- a/
lib/gdi/Makefile.am
+++ b/
lib/gdi/Makefile.am
@@
-18,9
+18,9
@@
libenigma_gdi_a_SOURCES = \
fb.cpp \
font.cpp \
font_arabic.cpp \
fb.cpp \
font.cpp \
font_arabic.cpp \
- gfbdc.cpp \
gfont.cpp \
glcddc.cpp \
gfont.cpp \
glcddc.cpp \
+ gmaindc.cpp \
gpixmap.cpp \
grc.cpp \
lcd.cpp \
gpixmap.cpp \
grc.cpp \
lcd.cpp \
@@
-38,7
+38,6
@@
gdiinclude_HEADERS = \
esize.h \
fb.h \
font.h \
esize.h \
fb.h \
font.h \
- gfbdc.h \
gfont.h \
glcddc.h \
gpixmap.h \
gfont.h \
glcddc.h \
gpixmap.h \
@@
-50,7
+49,10
@@
gdiinclude_HEADERS = \
if HAVE_LIBSDL
libenigma_gdi_a_SOURCES += \
if HAVE_LIBSDL
libenigma_gdi_a_SOURCES += \
- sdl.cpp
-gdiinclude_HEADERS += \
+ sdl.cpp \
sdl.h
sdl.h
+else
+libenigma_gdi_a_SOURCES += \
+ gfbdc.cpp \
+ gfbdc.h
endif
endif