1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
Author: Miriam Ruiz <little_miry@yahoo.es>
Description: Allow hard-coding a path to the font at build time
Last-Update: 2008-04-04
--- a/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c
+++ b/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c
@@ -278,6 +278,10 @@
enabledsound=0;
}
+#if defined(DEJAVUSANS_TTF)
+ fontPath=(char *)malloc(256);
+ strcpy(fontPath,DEJAVUSANS_TTF);
+#else
#if defined(WIN32)
fontPath=(char *)malloc(256);
strcpy(fontPath,getenv("WINDIR"));
@@ -289,7 +293,7 @@
strcat(fontPath,"/dejavu/DejaVuSans.ttf\0");
if (!fileExist(fontPath))fontPath="./DejaVuSans.ttf";
#endif
-
+#endif
/*
--- a/src/sdlBasic/src/sdlBrt/SDLengine/makefile
+++ b/src/sdlBasic/src/sdlBrt/SDLengine/makefile
@@ -71,8 +71,9 @@
CPP=g++
RANLIB= ranlib
RM=rm -f
+DEJAVUSANS_TTF=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-CFLAG= -Wall -g -O2 -I/usr/include/SDL -D_REENTRAT -DPLAY_MOD -DUNIX -DLINUX
+CFLAG= -Wall -g -O2 -I/usr/include/SDL -D_REENTRAT -DPLAY_MOD -DUNIX -DLINUX -DDEJAVUSANS_TTF=\"$(DEJAVUSANS_TTF)\"
LIBS=-Wl,-rpath, -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lvorbisfile -lvorbis -logg -lsmpeg -lasound -lSDL -lpng -ltiff -lz -ljpeg -lpthread -lm -lfreetype -ldl
#LIBS=-Wl,-rpath, -lSDL -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lvorbisfile -lvorbis -logg -lsmpeg -lpthread -lm -lfreetype -lSDL -lpng -ljpeg -ltiff -lz -lartsdsp -lasound -lartsdsp -ldl
#LIBS=-lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lsmpeg
--- a/src/sdlBasic/src/sdlBrt/makefile
+++ b/src/sdlBasic/src/sdlBrt/makefile
@@ -95,8 +95,9 @@
INSTALL=/usr/bin/install
RM=rm
STRIP=strip
+DEJAVUSANS_TTF=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-CFLAG= -Wall -g -O2 -I/usr/include/SDL -D_REENTRAT -DPLAY_MOD -DUNIX -DLINUX
+CFLAG= -Wall -g -O2 -I/usr/include/SDL -D_REENTRAT -DPLAY_MOD -DUNIX -DLINUX -DDEJAVUSANS_TTF=\"$(DEJAVUSANS_TTF)\"
COMPILE=$(CPP) $(CFLAG)
--- a/src/sdlBasic/src/sdlBrt/sdlBrt.c
+++ b/src/sdlBasic/src/sdlBrt/sdlBrt.c
@@ -256,6 +256,10 @@
/* gp2x Problem with allocation strings ??? */
+#if defined(DEJAVUSANS_TTF)
+ fontPath=(char *)malloc(256);
+ strcpy(fontPath,DEJAVUSANS_TTF);
+#else
#if defined(WIN32)
fontPath=(char *)malloc(256);
strcpy(fontPath,getenv("WINDIR"));
@@ -267,7 +271,7 @@
strcat(fontPath,"/dejavu/DejaVuSans.ttf\0");
if (!fileExist(fontPath))fontPath="./DejaVuSans.ttf";
#endif
-
+#endif
/*
#if defined(WIN32)
|