moved keymap.xml into data-dir

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 0a8fe82f628c7834f77c7f7292f99035b32eef8b..3a728b8df7e5e5d11b98989818ddfd1fd63ef3d4 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,4 +1,6 @@
+#undef WITH_SDL
 #ifdef WITH_SDL
+#error
 #define SDLDC
 #endif
 #include <stdio.h>
@@ -13,6 +15,7 @@
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
 #ifdef WITH_SDL
+#error
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/font.h> 
@@ -152,7 +155,7 @@ int main(int argc, char **argv)
        gFBDC::getInstance(my_dc);
 #endif
 
-       fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
+       fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
 
        eWidgetDesktop dsk(eSize(720, 576));