- Windows makefile now uses sdl-config
- Fix bug with font file location - now searches $NETMAPRDIR for it once more.
This commit is contained in:
parent
8e677d6b6c
commit
83b63fe1c7
|
@ -1,5 +1,5 @@
|
||||||
netmapr: netmapr.c constants.h netmapr.h Makefile
|
netmapr: netmapr.c constants.h netmapr.h Makefile
|
||||||
gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g netmapr.c windows_files/attachicon.res -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf
|
gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g netmapr.c windows_files/attachicon.res `sdl-config --cflags --libs` -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf
|
||||||
|
|
||||||
convert: convert.c convert.h Makefile
|
convert: convert.c convert.h Makefile
|
||||||
gcc -Wall -g convert.c -I/usr/local/include -oconvert -lmingw32 -L/usr/local/lib -lSDLmain -lSDL
|
gcc -Wall -g convert.c -I/usr/local/include -oconvert -lmingw32 -L/usr/local/lib -lSDLmain -lSDL
|
||||||
|
|
|
@ -6109,10 +6109,10 @@ int initgraphics(void) {
|
||||||
sprintf(file, "/usr/local/share/netmapr/verdana.ttf");
|
sprintf(file, "/usr/local/share/netmapr/verdana.ttf");
|
||||||
font[i] = TTF_OpenFont(file,i);
|
font[i] = TTF_OpenFont(file,i);
|
||||||
}
|
}
|
||||||
//if (!font[i]) {
|
if (!font[i]) {
|
||||||
// sprintf(file, "%s/verdana.ttf",progdir);
|
sprintf(file, "%s/verdana.ttf",progdir);
|
||||||
// font[i] = TTF_OpenFont(file,i);
|
font[i] = TTF_OpenFont(file,i);
|
||||||
//}
|
}
|
||||||
if (!font[i]) {
|
if (!font[i]) {
|
||||||
printf("Error opening font: %s\n", TTF_GetError());
|
printf("Error opening font: %s\n", TTF_GetError());
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
Loading…
Reference in New Issue