teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 06:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix build against system libfreetype

Browse source
This commit is contained in:
Ludwig Nussel 2005-08-30 15:35:24 +00:00
parent fc29447726
commit 3973f4aaa2
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
code/renderer/tr_font.c
View file

@ -74,11 +74,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/qcommon.h" #include "../qcommon/qcommon.h"
#ifdef BUILD_FREETYPE #ifdef BUILD_FREETYPE
#include "../ft2/fterrors.h" #include <ft2build.h>
#include "../ft2/ftsystem.h" #include <freetype/fterrors.h>
#include "../ft2/ftimage.h" #include <freetype/ftsystem.h>
#include "../ft2/freetype.h" #include <freetype/ftimage.h>
#include "../ft2/ftoutln.h" #include <freetype/freetype.h>
#include <freetype/ftoutln.h>
#define _FLOOR(x) ((x) & -64) #define _FLOOR(x) ((x) & -64)
#define _CEIL(x) (((x)+63) & -64) #define _CEIL(x) (((x)+63) & -64)
@ -310,7 +311,7 @@ typedef union {
float readFloat() { float readFloat() {
poor me; poor me;
#if idppc #if __WORD_ORDER == __BIG_ENDIAN
me.fred[0] = fdFile[fdOffset+3]; me.fred[0] = fdFile[fdOffset+3];
me.fred[1] = fdFile[fdOffset+2]; me.fred[1] = fdFile[fdOffset+2];
me.fred[2] = fdFile[fdOffset+1]; me.fred[2] = fdFile[fdOffset+1];
@ -342,6 +343,12 @@ void RE_RegisterFont(const char *fontName, int pointSize, fontInfo_t *font) {
float dpi = 72; // float dpi = 72; //
float glyphScale = 72.0f / dpi; // change the scale to be relative to 1 based on 72 dpi ( so dpi of 144 means a scale of .5 ) float glyphScale = 72.0f / dpi; // change the scale to be relative to 1 based on 72 dpi ( so dpi of 144 means a scale of .5 )
if (!fontName) {
ri.Printf(PRINT_ALL, "RE_RegisterFont: called with empty name\n");
return;
}
if (pointSize <= 0) { if (pointSize <= 0) {
pointSize = 12; pointSize = 12;
} }

9
code/unix/Makefile
View file

@ -46,7 +46,7 @@ BDIR=$(MOUNT_DIR)/../run
# BUILD_NAME=$(BUILD_NAME) # BUILD_NAME=$(BUILD_NAME)
BUILD_NAME=quake3 BUILD_NAME=quake3
BUILD_FREETYPE=0
############################################################################# #############################################################################
## ##
@ -156,6 +156,13 @@ ifeq ($(PLATFORM),linux)
LDFLAGS=-ldl -lm LDFLAGS=-ldl -lm
GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
DEBUG_CFLAGS += -DHAVE_EXECINFO_H
ifeq ($(BUILD_FREETYPE),1)
RELEASE_CFLAGS += $(shell pkg-config --cflags freetype2) -DBUILD_FREETYPE
DEBUG_CFLAGS += $(shell pkg-config --cflags freetype2) -DBUILD_FREETYPE
LDFLAGS += $(shell pkg-config --libs freetype2)
endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
# linux32 make ... # linux32 make ...
BASE_CFLAGS += -m32 BASE_CFLAGS += -m32