From 60e5fe14d01b84bbef35d5286183a85ff72002dd Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 20 May 2005 19:42:13 +0000
Subject: undo shitty stuff.. sorry

---
 main/Makefile.am    | 5 +++--
 main/enigma-gdi.cpp | 2 +-
 main/enigma-gui.cpp | 2 +-
 main/enigma.cpp     | 5 ++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'main')

diff --git a/main/Makefile.am b/main/Makefile.am
index 39efea2b..ad838f5f 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -27,9 +27,10 @@ enigma2_LDADD = \
 	@MAD_LIBS@ \
 	@PNG_LIBS@ \
 	@SIGC_LIBS@ \
+	@SDL_LIBS@ \
 	-ldl -lpthread -lcrypt -lresolv -lpython2.3
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 	@rm -f enigma2$(EXEEXT)
-	$(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
-#	g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
+#	$(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
+	g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS)
diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 003a3cc8..d0010adf 100644
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -68,7 +68,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
 
 	p.resetClip(gRegion(eRect(0, 0, 720, 576)));
 	
diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp
index 31da7a52..475a4539 100644
--- a/main/enigma-gui.cpp
+++ b/main/enigma-gui.cpp
@@ -67,7 +67,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	dsk.setDC(my_dc);
diff --git a/main/enigma.cpp b/main/enigma.cpp
index 4f3287f5..156964ce 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,4 @@
+#define SDLDC
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,9 +10,7 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
-#ifdef SDLDC
 #include <lib/gdi/sdl.h>
-#endif
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -145,7 +144,7 @@ int main(int argc, char **argv)
 	gFBDC::getInstance(my_dc);
 #endif
 
-	fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
-- 
cgit v1.2.3