Install display skin based on autoconf settings
authorMike Looijmans <milo-software@users.sourceforge.net>
Thu, 25 Nov 2010 17:44:08 +0000 (18:44 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Thu, 25 Nov 2010 17:44:08 +0000 (18:44 +0100)
configure.ac
data/Makefile.am
skin.py

index 663c157..061a7bc 100755 (executable)
@@ -43,12 +43,21 @@ AC_ARG_WITH(textlcd,
        [[withtextlcd=$withval]],
        [[withtextlcd=no]]
 )
-
 if test x"$withtextlcd" != xno ; then
        AC_DEFINE(HAVE_TEXTLCD, 1,[Define when using an ascii based lcd device])
 fi
 AM_CONDITIONAL(HAVE_TEXTLCD, test x"$withtextlcd" != xno)
 
+AC_ARG_WITH(colorlcd,
+       AC_HELP_STRING([--with-colorlcd], [use 96x64 16bpp color display, yes or no]),
+       [[withcolorlcd=$withval]],
+       [[withcolorlcd=no]]
+)
+if test x"$withcolorlcd" != xno ; then
+       AC_DEFINE(HAVE_COLORLCD, 1,[Define when using a 96x64 color display device])
+fi
+
+AM_CONDITIONAL(HAVE_TEXTLCD, test x"$withcolorlcd" != xno)
 AC_CHECK_HEADER(dreamdvd/ddvdlib.h,have_ddvdlib="yes",have_ddvdlib="no")
 if test x"${have_ddvdlib}" = xyes ; then
        AC_DEFINE(HAVE_DDVDLIB, 1,[Define if ddvdlib is available])
index b392dbc..bc73565 100644 (file)
@@ -24,5 +24,9 @@ dist_pkgdata_DATA = \
 if HAVE_TEXTLCD
 dist_pkgdata_DATA += skin_text.xml
 else
-dist_pkgdata_DATA += skin_display.xml skin_display96.xml
+if HAVE_COLORLCD
+dist_pkgdata_DATA += skin_display96.xml
+else
+dist_pkgdata_DATA += skin_display.xml
+endif
 endif
diff --git a/skin.py b/skin.py
index e9c5c79..98789b3 100755 (executable)
--- a/skin.py
+++ b/skin.py
@@ -62,6 +62,7 @@ except (SkinError, IOError, AssertionError), err:
 
 # Only one of these two is present, compliments of AM_CONDITIONAL
 addSkin('skin_display.xml')
+addSkin('skin_display96.xml')
 addSkin('skin_text.xml')
 
 addSkin('skin_subtitles.xml')