Adding $(SO) and $(SA), denoting objects and library for a static build.
This is currently used for Unix only -- it should be extended that it is possible to build DLLs and static libs on other platforms also. Formatting.
This commit is contained in:
parent
9cb8fb187a
commit
db578ae090
|
@ -44,15 +44,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
@ -119,7 +121,7 @@ ifdef BUILD_FREETYPE
|
||||||
|
|
||||||
# This final rule is used to link all object files into a single library.
|
# This final rule is used to link all object files into a single library.
|
||||||
# It is part of the system-specific sub-Makefile because not all
|
# It is part of the system-specific sub-Makefile because not all
|
||||||
# librarians accept a simple syntax like:
|
# librarians accept a simple syntax like
|
||||||
#
|
#
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
|
|
|
@ -36,7 +36,7 @@ PLATFORM := dos
|
||||||
OBJ_DIR := obj
|
OBJ_DIR := obj
|
||||||
|
|
||||||
|
|
||||||
# The directory where all library files are placed
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
|
@ -44,15 +44,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
@ -121,7 +123,7 @@ ifdef BUILD_FREETYPE
|
||||||
# It is part of the system-specific sub-Makefile because not all
|
# It is part of the system-specific sub-Makefile because not all
|
||||||
# librarians accept a simple syntax like:
|
# librarians accept a simple syntax like:
|
||||||
#
|
#
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
$(FT_LIBRARY): $(OBJECTS_LIST)
|
$(FT_LIBRARY): $(OBJECTS_LIST)
|
||||||
-$(DELETE) $@
|
-$(DELETE) $@
|
||||||
|
|
|
@ -47,15 +47,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
@ -127,7 +129,7 @@ ifdef BUILD_FREETYPE
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
$(FT_LIBRARY): $(OBJECTS_LIST)
|
$(FT_LIBRARY): $(OBJECTS_LIST)
|
||||||
-$(DELETE) $@
|
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(FT_LIBRARY)) 2> nul
|
||||||
$(FT_LIBRARIAN) $@ $(OBJECTS_LIST)
|
$(FT_LIBRARIAN) $@ $(OBJECTS_LIST)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -45,15 +45,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
|
|
@ -61,15 +61,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := lo
|
O := lo
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := la
|
A := la
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
@ -141,7 +143,8 @@ ifdef BUILD_FREETYPE
|
||||||
#
|
#
|
||||||
clean_freetype_unix:
|
clean_freetype_unix:
|
||||||
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
||||||
-$(DELETE) $(OBJ_DIR)/*.o $(CLEAN)
|
-$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S))
|
||||||
|
-$(DELETE) $(CLEAN)
|
||||||
|
|
||||||
distclean_freetype_unix: clean_freetype_unix
|
distclean_freetype_unix: clean_freetype_unix
|
||||||
-$(DELETE) $(FT_LIBRARY)
|
-$(DELETE) $(FT_LIBRARY)
|
||||||
|
@ -149,14 +152,14 @@ ifdef BUILD_FREETYPE
|
||||||
-$(DELDIR) $(OBJ_DIR)/.libs
|
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||||
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||||
|
|
||||||
# Librarian to use to build the static library
|
# Librarian to use to build the library
|
||||||
#
|
#
|
||||||
FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CCraw)
|
FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CCraw)
|
||||||
|
|
||||||
|
|
||||||
# This final rule is used to link all object files into a single library.
|
# This final rule is used to link all object files into a single library.
|
||||||
# It is part of the system-specific sub-Makefile because not all
|
# It is part of the system-specific sub-Makefile because not all
|
||||||
# librarians accept a simple syntax like:
|
# librarians accept a simple syntax like
|
||||||
#
|
#
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
|
|
|
@ -61,15 +61,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := lo
|
O := lo
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := la
|
A := la
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
@ -108,9 +110,7 @@ T := -o # Don't remove this comment line! We need the space after `-o'.
|
||||||
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
|
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
|
||||||
# ANSI compliance.
|
# ANSI compliance.
|
||||||
#
|
#
|
||||||
ifndef CFLAGS
|
CFLAGS := -c -Wall -g -O2
|
||||||
CFLAGS := -c -g -O2 -Wall
|
|
||||||
endif
|
|
||||||
|
|
||||||
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
||||||
#
|
#
|
||||||
|
@ -119,7 +119,13 @@ ANSIFLAGS := -pedantic -ansi
|
||||||
# C compiler to use -- we use libtool!
|
# C compiler to use -- we use libtool!
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
CC := $(BUILD)/libtool --mode=compile $(CC)
|
CCraw := $(CC)
|
||||||
|
CC := $(BUILD)/libtool --mode=compile $(CCraw)
|
||||||
|
|
||||||
|
# linker flags
|
||||||
|
#
|
||||||
|
LDFLAGS :=
|
||||||
|
|
||||||
|
|
||||||
ifdef BUILD_FREETYPE
|
ifdef BUILD_FREETYPE
|
||||||
|
|
||||||
|
@ -137,7 +143,8 @@ ifdef BUILD_FREETYPE
|
||||||
#
|
#
|
||||||
clean_freetype_unix:
|
clean_freetype_unix:
|
||||||
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
||||||
-$(DELETE) $(OBJ_DIR)/*.o $(CLEAN)
|
-$(DELETE) $(subst $O,$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S))
|
||||||
|
-$(DELETE) $(CLEAN)
|
||||||
|
|
||||||
distclean_freetype_unix: clean_freetype_unix
|
distclean_freetype_unix: clean_freetype_unix
|
||||||
-$(DELETE) $(FT_LIBRARY)
|
-$(DELETE) $(FT_LIBRARY)
|
||||||
|
@ -145,14 +152,14 @@ ifdef BUILD_FREETYPE
|
||||||
-$(DELDIR) $(OBJ_DIR)/.libs
|
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||||
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||||
|
|
||||||
# Librarian to use to build the static library
|
# Librarian to use to build the library
|
||||||
#
|
#
|
||||||
FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CC)
|
FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CCraw)
|
||||||
|
|
||||||
|
|
||||||
# This final rule is used to link all object files into a single library.
|
# This final rule is used to link all object files into a single library.
|
||||||
# It is part of the system-specific sub-Makefile because not all
|
# It is part of the system-specific sub-Makefile because not all
|
||||||
# librarians accept a simple syntax like:
|
# librarians accept a simple syntax like
|
||||||
#
|
#
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
#
|
#
|
||||||
# NOTE: This version requires that GNU Make be invoked from the Windows
|
# NOTE: This version requires that GNU Make is invoked from the Windows
|
||||||
# Shell (_not_ Cygwin BASH)!
|
# Shell (_not_ Cygwin BASH)!
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -50,15 +50,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
#
|
#
|
||||||
# NOTE: This version requires that GNU Make be invoked from the Windows
|
# NOTE: This version requires that GNU Make is invoked from the Windows
|
||||||
# Shell (_not_ Cygwin BASH)!
|
# Shell (_not_ Cygwin BASH)!
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -48,15 +48,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := o
|
||||||
|
SO := o
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := a
|
||||||
|
SA := a
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
|
|
@ -1,20 +1,17 @@
|
||||||
#*******************************************************************
|
#
|
||||||
#*
|
# FreeType 2 Configuration rules for Win32 + IBM Visual Age C++
|
||||||
#* FreeType 2 Configuration rules for Win32 + IBM Visual Age C++
|
#
|
||||||
#*
|
|
||||||
#* Copyright 1996-2000 by
|
|
||||||
#* David Turner, Robert Wilhelm, and Werner Lemberg.
|
# Copyright 1996-2000 by
|
||||||
#*
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#* This file is part of the FreeType project, and may only be used
|
#
|
||||||
#* modified and distributed under the terms of the FreeType project
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
#* license, LICENSE.TXT. By continuing to use, modify, or distribute
|
# and distributed under the terms of the FreeType project license,
|
||||||
#* this file you indicate that you have read the license and
|
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
|
||||||
#* understand and accept it fully.
|
# indicate that you have read the license and understand and accept it
|
||||||
#*
|
# fully.
|
||||||
#* Please read the file "freetype/docs/config.txt" to understand
|
#
|
||||||
#* what this file does..
|
|
||||||
#*
|
|
||||||
#*******************************************************************
|
|
||||||
|
|
||||||
DELETE := del
|
DELETE := del
|
||||||
SEP := $(strip \ )
|
SEP := $(strip \ )
|
||||||
|
@ -23,105 +20,103 @@ BUILD := $(TOP)$(SEP)config$(SEP)win32
|
||||||
PLATFORM := win32
|
PLATFORM := win32
|
||||||
CC := icc
|
CC := icc
|
||||||
|
|
||||||
# the directory where all object files are placed
|
# The directory where all object files are placed.
|
||||||
#
|
#
|
||||||
# Note that this is not $(TOP)/obj !!
|
# Note that this is not $(TOP)/obj!
|
||||||
# This lets you build the library in your own directory
|
# This lets you build the library in your own directory with something like
|
||||||
# with something like :
|
|
||||||
#
|
|
||||||
# set TOP=....../path/to/freetype2/top/dir...
|
|
||||||
# mkdir obj
|
|
||||||
# make -f %TOP%/Makefile setup [options]
|
|
||||||
# make -f %TOP%/Makefile
|
|
||||||
#
|
#
|
||||||
|
# set TOP=.../path/to/freetype2/top/dir...
|
||||||
|
# mkdir obj
|
||||||
|
# make -f %TOP%/Makefile setup [options]
|
||||||
|
# make -f %TOP%/Makefile
|
||||||
#
|
#
|
||||||
OBJ_DIR := obj
|
OBJ_DIR := obj
|
||||||
|
|
||||||
|
|
||||||
# the directory where all library files are placed
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# by default, this is the same as OBJ_DIR, however, this can be
|
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
||||||
# changed to suit particular needs..
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# the object file extension, this can be .o, .tco, .obj, etc..
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# depending on the platform
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
|
SO := obj
|
||||||
|
|
||||||
# the library file extension, this can be .a, .lib, etc..
|
# The library file extension (for standard and static libraries). This can
|
||||||
# depending on the platform
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := lib
|
A := lib
|
||||||
|
SA := lib
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file.
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
# Note that the DOS-specific Makefile uses a shorter (8.3) name
|
# uses a shorter (8.3) name.
|
||||||
#
|
#
|
||||||
LIBRARY := freetype
|
LIBRARY := freetype
|
||||||
|
|
||||||
|
|
||||||
# path inclusion flag.
|
# Path inclusion flag. Some compilers use a different flag than `-I' to
|
||||||
#
|
# specify an additional include path. Examples are `/i=' or `-J'.
|
||||||
# Some compilers use a different flag than '-I' to specify an
|
|
||||||
# additional include path. Examples are "/i=" or "-J", etc...
|
|
||||||
#
|
#
|
||||||
I := /I
|
I := /I
|
||||||
|
|
||||||
|
|
||||||
# The link flag used to specify a given library file on link.
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# Note that this is only used to compile the demo programs, not
|
# object. Usually is `-D' like in `-DDEBUG'.
|
||||||
# the library itself.
|
#
|
||||||
|
D := /D
|
||||||
|
|
||||||
|
|
||||||
|
# The link flag used to specify a given library file on link. Note that
|
||||||
|
# this is only used to compile the demo programs, not the library itself.
|
||||||
#
|
#
|
||||||
L := /Fl
|
L := /Fl
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given
|
# Target flag.
|
||||||
# source object. Usually is '-D' like in "-DDEBUG"
|
|
||||||
#
|
|
||||||
D := /D
|
|
||||||
|
|
||||||
# Target flag - LCC uses "-Fo" instead of "-o ", what a broken compiler
|
|
||||||
#
|
|
||||||
#
|
#
|
||||||
T := /Fo
|
T := /Fo
|
||||||
|
|
||||||
|
|
||||||
# C flags
|
# C flags
|
||||||
#
|
#
|
||||||
# These should concern :
|
# These should concern: debug output, optimization & warnings.
|
||||||
#
|
|
||||||
# - debug output
|
|
||||||
# - optimization
|
|
||||||
# - warnings
|
|
||||||
# - ansi compliance..
|
|
||||||
#
|
#
|
||||||
ifndef CFLAGS
|
ifndef CFLAGS
|
||||||
CFLAGS := /Q- /Gd+ /O2 /G5 /W3 /C
|
CFLAGS := /Q- /Gd+ /O2 /G5 /W3 /C
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ANSI_FLAGS : put there the flags used to make your compiler ANSI-compliant
|
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
||||||
# nothing (if it already is by default like LCC).
|
|
||||||
#
|
#
|
||||||
ANSI_FLAGS := /Sa
|
ANSI_FLAGS := /Sa
|
||||||
|
|
||||||
|
|
||||||
ifdef BUILD_FREETYPE
|
ifdef BUILD_FREETYPE
|
||||||
|
|
||||||
include $(TOP)/builds/freetype.mk
|
# Now include the main sub-makefile. It contains all the rules used to
|
||||||
|
# build the library with the previous variables defined.
|
||||||
|
#
|
||||||
|
include $(TOP)/builds/freetype.mk
|
||||||
|
|
||||||
clean_freetype: clean_freetype_dos
|
# The cleanup targets.
|
||||||
distclean_freetype: distclean_freetype_dos
|
#
|
||||||
|
clean_freetype: clean_freetype_dos
|
||||||
|
distclean_freetype: distclean_freetype_dos
|
||||||
|
|
||||||
# This final rule is used to link all object files into a single
|
# This final rule is used to link all object files into a single library.
|
||||||
# library. It is part of the system-specific sub-Makefile because not
|
# It is part of the system-specific sub-Makefile because not all
|
||||||
# all librarians accept a simple syntax like :
|
# librarians accept a simple syntax like
|
||||||
#
|
#
|
||||||
# librarian library_file {list of object files}
|
# librarian library_file {list of object files}
|
||||||
#
|
#
|
||||||
$(FT_LIBRARY): $(OBJECTS_LIST)
|
$(FT_LIBRARY): $(OBJECTS_LIST)
|
||||||
lib /nologo /out:$@ $(OBJECTS_LIST)
|
lib /nologo /out:$@ $(OBJECTS_LIST)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
ifndef TOP
|
ifndef TOP
|
||||||
TOP := .
|
TOP := .
|
||||||
endif
|
endif
|
||||||
|
@ -44,15 +45,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
|
SO := obj
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := lib
|
A := lib
|
||||||
|
SA := lib
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
ifndef TOP
|
ifndef TOP
|
||||||
TOP := .
|
TOP := .
|
||||||
endif
|
endif
|
||||||
|
@ -44,15 +45,17 @@ OBJ_DIR := obj
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
|
SO := ojc
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension (for standard and static libraries). This can
|
||||||
# platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := lib
|
A := lib
|
||||||
|
SA := lib
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
/* ahangles.h */
|
/* ahangles.h */
|
||||||
/* */
|
/* */
|
||||||
/* A routine used to compute vector angles with limited accuracy */
|
/* A routine used to compute vector angles with limited accuracy */
|
||||||
/* and very high speed. */
|
/* and very high speed (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000 Catharon Productions Inc. */
|
/* Copyright 2000 Catharon Productions Inc. */
|
||||||
/* Author: David Turner */
|
/* Author: David Turner */
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
/* ahangles.h */
|
/* ahangles.h */
|
||||||
/* */
|
/* */
|
||||||
/* A routine used to compute vector angles with limited accuracy */
|
/* A routine used to compute vector angles with limited accuracy */
|
||||||
/* and very high speed. */
|
/* and very high speed (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000 Catharon Productions Inc. */
|
/* Copyright 2000 Catharon Productions Inc. */
|
||||||
/* Author: David Turner */
|
/* Author: David Turner */
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* ahglobal.c */
|
/* ahglobal.c */
|
||||||
/* */
|
/* */
|
||||||
/* Routines used to compute global metrics automatically. */
|
/* Routines used to compute global metrics automatically (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000 Catharon Productions Inc. */
|
/* Copyright 2000 Catharon Productions Inc. */
|
||||||
/* Author: David Turner */
|
/* Author: David Turner */
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
/* */
|
/* */
|
||||||
/* ahglobal.h */
|
/* ahglobal.h */
|
||||||
/* */
|
/* */
|
||||||
/* Routines used to compute global metrics automatically. */
|
/* Routines used to compute global metrics automatically */
|
||||||
|
/* (specification). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2000 Catharon Productions Inc. */
|
/* Copyright 2000 Catharon Productions Inc. */
|
||||||
/* Author: David Turner */
|
/* Author: David Turner */
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1445,7 +1445,7 @@
|
||||||
hinting = ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
|
hinting = ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
|
||||||
( load_flags & FT_LOAD_NO_HINTING ) == 0;
|
( load_flags & FT_LOAD_NO_HINTING ) == 0;
|
||||||
|
|
||||||
glyph->root.format = ft_glyph_format_none;
|
glyph->root.format = ft_glyph_format_outline;
|
||||||
|
|
||||||
{
|
{
|
||||||
CID_Init_Decoder( &decoder );
|
CID_Init_Decoder( &decoder );
|
||||||
|
|
Loading…
Reference in New Issue