diff options
| author | Ronny Strutz <ronny.strutz@multimedia-labs.de> | 2005-08-28 23:13:58 +0000 |
|---|---|---|
| committer | Ronny Strutz <ronny.strutz@multimedia-labs.de> | 2005-08-28 23:13:58 +0000 |
| commit | 301bab11f8453a6899153b7be338a352803b22cb (patch) | |
| tree | 5df637e4d8812cb83f5073f5160625aee65c3937 /main | |
| parent | 1f5b1a20e4de369c197de1dae8fcb368e3e10b26 (diff) | |
| download | enigma2-301bab11f8453a6899153b7be338a352803b22cb.tar.gz enigma2-301bab11f8453a6899153b7be338a352803b22cb.zip | |
added setup screens
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 4 | ||||
| -rw-r--r-- | main/enigma.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index d96e25aa..5a7d1ef7 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -14,6 +14,7 @@ enigma2_LDADD_WHOLE = \ $(top_builddir)/lib/driver/libenigma_driver.a \ $(top_builddir)/lib/dvb/libenigma_dvb.a \ $(top_builddir)/lib/dvb_si/libenigma_dvb_si.a \ + $(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.a \ $(top_builddir)/lib/gdi/libenigma_gdi.a \ $(top_builddir)/lib/gui/libenigma_gui.a \ $(top_builddir)/lib/python/libenigma_python.a \ @@ -27,8 +28,7 @@ enigma2_LDADD = \ @MAD_LIBS@ \ @PNG_LIBS@ \ @SIGC_LIBS@ \ - @SDL_LIBS@ \ - -ldl -lpthread -lcrypt -lresolv -lpython2.3 + -ldl -lpthread -lcrypt -lresolv -lpython2.4 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) # @rm -f enigma2$(EXEEXT) diff --git a/main/enigma.cpp b/main/enigma.cpp index 3d84db7d..3a728b8d 100644 --- 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> |