diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-21 15:22:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-21 15:22:51 +0000 |
| commit | 1ee02cd0419021c3d4950af2619da39c6e9c47f0 (patch) | |
| tree | f5b61f7d9e151c7a64cff51399560ffb77800349 /freetype/builds/compiler | |
| parent | d8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff) | |
| download | vcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.tar.gz vcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.tar.bz2 vcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.zip | |
Updated to freetype-2.3.11
Diffstat (limited to 'freetype/builds/compiler')
| -rw-r--r-- | freetype/builds/compiler/bcc-dev.mk | 12 | ||||
| -rw-r--r-- | freetype/builds/compiler/bcc.mk | 12 | ||||
| -rw-r--r-- | freetype/builds/compiler/gcc.mk | 4 |
3 files changed, 22 insertions, 6 deletions
diff --git a/freetype/builds/compiler/bcc-dev.mk b/freetype/builds/compiler/bcc-dev.mk index ba1a88a30..63a46ad16 100644 --- a/freetype/builds/compiler/bcc-dev.mk +++ b/freetype/builds/compiler/bcc-dev.mk @@ -52,7 +52,8 @@ L := # Target flag -- no trailing space. # -T := -o +T := -o +TE := -e # C flags @@ -72,7 +73,14 @@ ANSIFLAGS := -A # Library linking # CLEAN_LIBRARY ?= $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY)) -LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%)) +LINK_LIBRARY = tlib /u /P128 $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%)) + + +# Borland C++ specific temporary files +# +CLEAN += \ + $(subst /,$(SEP),$(TOP_DIR)/apinames.$(O)) \ + $(subst /,$(SEP),$(OBJ_DIR)/apinames.tds) # EOF diff --git a/freetype/builds/compiler/bcc.mk b/freetype/builds/compiler/bcc.mk index 509cb7248..855edadf0 100644 --- a/freetype/builds/compiler/bcc.mk +++ b/freetype/builds/compiler/bcc.mk @@ -52,7 +52,8 @@ L := # Target flag -- no trailing space. # -T := -o +T := -o +TE := -e # C flags @@ -72,7 +73,14 @@ ANSIFLAGS := -A # Library linking # CLEAN_LIBRARY ?= $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY)) -LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%)) +LINK_LIBRARY = tlib /u /P128 $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%)) + + +# Borland C++ specific temporary files +# +CLEAN += \ + $(subst /,$(SEP),$(TOP_DIR)/apinames.$(O)) \ + $(subst /,$(SEP),$(OBJ_DIR)/apinames.tds) # EOF diff --git a/freetype/builds/compiler/gcc.mk b/freetype/builds/compiler/gcc.mk index e941443a0..f6b7101b3 100644 --- a/freetype/builds/compiler/gcc.mk +++ b/freetype/builds/compiler/gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005, 2006 by +# Copyright 1996-2000, 2003, 2005, 2006, 2009 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -61,7 +61,7 @@ T := -o$(space) # Use the ANSIFLAGS variable to define the compiler flags used to enfore # ANSI compliance. # -CFLAGS ?= -c -g -O6 -Wall +CFLAGS ?= -c -g -O3 -Wall # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. # |