Adding $(CFG) variable to pass configure script parameters.
Fixing DLL version.
This commit is contained in:
parent
d060a75b0d
commit
e616d22529
|
@ -534,7 +534,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
version_info='0:0:0'
|
version_info='6:0:0'
|
||||||
|
|
||||||
|
|
||||||
ac_aux_dir=
|
ac_aux_dir=
|
||||||
|
|
|
@ -5,10 +5,10 @@ dnl
|
||||||
|
|
||||||
AC_INIT(ftconfig.in)
|
AC_INIT(ftconfig.in)
|
||||||
|
|
||||||
dnl Configuration file - stay in 8.3 limit
|
dnl Configuration file -- stay in 8.3 limit
|
||||||
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
|
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
|
||||||
|
|
||||||
version_info='0:0:0'
|
version_info='6:0:0'
|
||||||
AC_SUBST(version_info)
|
AC_SUBST(version_info)
|
||||||
|
|
||||||
dnl checks for system type
|
dnl checks for system type
|
||||||
|
|
|
@ -26,7 +26,10 @@ ifeq ($(PLATFORM),ansi)
|
||||||
# configuration file. Otherwise, the configure script is called and
|
# configuration file. Otherwise, the configure script is called and
|
||||||
# `unix.mk' is created.
|
# `unix.mk' is created.
|
||||||
#
|
#
|
||||||
# The use of the configure script can be forced by saying `make unix'.
|
# The use of the configure script can be forced by saying `make unix';
|
||||||
|
# arguments to `configure' should be in the CFG variable. Example:
|
||||||
|
#
|
||||||
|
# make unix CFG="--prefix=/usr --disable-static"
|
||||||
#
|
#
|
||||||
# Feel free to add support for other platform specific compilers in this
|
# Feel free to add support for other platform specific compilers in this
|
||||||
# directory (e.g. solaris.mk + changes here to detect the platform).
|
# directory (e.g. solaris.mk + changes here to detect the platform).
|
||||||
|
@ -62,7 +65,7 @@ ifeq ($(PLATFORM),ansi)
|
||||||
setup: std_setup
|
setup: std_setup
|
||||||
|
|
||||||
unix.mk: builds/unix/unix.in
|
unix.mk: builds/unix/unix.in
|
||||||
cd builds/unix; ./configure
|
cd builds/unix; ./configure $(CFG)
|
||||||
|
|
||||||
endif # test Unix
|
endif # test Unix
|
||||||
endif # test PLATFORM
|
endif # test PLATFORM
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# FreeType 2 configuration rules for a standard Unix compiler
|
# FreeType 2 configuration rules templates for Unix + configure
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,11 +17,28 @@ ifndef TOP
|
||||||
TOP := .
|
TOP := .
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DELETE := rm -f
|
DELETE := rm -f
|
||||||
SEP := /
|
DELDIR := rmdir
|
||||||
HOSTSEP := $(SEP)
|
SEP := /
|
||||||
BUILD := $(TOP)/builds/unix
|
HOSTSEP := $(SEP)
|
||||||
PLATFORM := unix
|
BUILD := $(TOP)/builds/unix
|
||||||
|
PLATFORM := unix
|
||||||
|
|
||||||
|
FTSYS_SRC := $(BUILD)/ftsystem.c
|
||||||
|
|
||||||
|
DISTCLEAN += $(BUILD)/config.cache \
|
||||||
|
$(BUILD)/config.log \
|
||||||
|
$(BUILD)/config.status \
|
||||||
|
$(BUILD)/unix.mk \
|
||||||
|
$(BUILD)/ftconfig.h \
|
||||||
|
$(BUILD)/libtool
|
||||||
|
|
||||||
|
|
||||||
|
prefix := /usr/local
|
||||||
|
exec_prefix := ${prefix}
|
||||||
|
libdir := ${exec_prefix}/lib
|
||||||
|
version_info := 6:0:0
|
||||||
|
|
||||||
|
|
||||||
# The directory where all object files are placed.
|
# The directory where all object files are placed.
|
||||||
#
|
#
|
||||||
|
@ -47,12 +64,12 @@ LIB_DIR := $(OBJ_DIR)
|
||||||
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
# The object file extension. This can be .o, .tco, .obj, etc., depending on
|
||||||
# the platform.
|
# the platform.
|
||||||
#
|
#
|
||||||
O := o
|
O := lo
|
||||||
|
|
||||||
# The library file extension. This can be .a, .lib, etc., depending on the
|
# The library file extension. This can be .a, .lib, etc., depending on the
|
||||||
# platform.
|
# platform.
|
||||||
#
|
#
|
||||||
A := a
|
A := la
|
||||||
|
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -92,13 +109,17 @@ T := -o # Don't remove this comment line! We need the space after `-o'.
|
||||||
# ANSI compliance.
|
# ANSI compliance.
|
||||||
#
|
#
|
||||||
ifndef CFLAGS
|
ifndef CFLAGS
|
||||||
CFLAGS := -c
|
CFLAGS := -c -g -O2 -Wall
|
||||||
endif
|
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.
|
||||||
#
|
#
|
||||||
ANSIFLAGS :=
|
ANSIFLAGS := -pedantic -ansi
|
||||||
|
|
||||||
|
# C compiler to use -- we use libtool!
|
||||||
|
#
|
||||||
|
#
|
||||||
|
CC := $(BUILD)/libtool --mode=compile $(CC)
|
||||||
|
|
||||||
ifdef BUILD_FREETYPE
|
ifdef BUILD_FREETYPE
|
||||||
|
|
||||||
|
@ -109,12 +130,24 @@ ifdef BUILD_FREETYPE
|
||||||
|
|
||||||
# The cleanup targets.
|
# The cleanup targets.
|
||||||
#
|
#
|
||||||
clean_freetype: clean_freetype_std
|
clean_freetype: clean_freetype_unix
|
||||||
distclean_freetype: distclean_freetype_std
|
distclean_freetype: distclean_freetype_unix
|
||||||
|
|
||||||
|
# Unix cleaning and distclean rules.
|
||||||
|
#
|
||||||
|
clean_freetype_unix:
|
||||||
|
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
||||||
|
-$(DELETE) $(OBJ_DIR)/*.o $(CLEAN)
|
||||||
|
|
||||||
|
distclean_freetype_unix: clean_freetype_unix
|
||||||
|
-$(DELETE) $(FT_LIBRARY)
|
||||||
|
-$(DELETE) $(OBJ_DIR)/.libs/*
|
||||||
|
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||||
|
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||||
|
|
||||||
# Librarian to use to build the static library
|
# Librarian to use to build the static library
|
||||||
#
|
#
|
||||||
FT_LIBRARIAN := $(AR) -r
|
FT_LIBRARIAN := $(BUILD)/libtool --mode=link $(CC)
|
||||||
|
|
||||||
|
|
||||||
# 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.
|
||||||
|
@ -124,8 +157,8 @@ 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) $@
|
$(FT_LIBRARIAN) -o $@ $(OBJECTS_LIST) \
|
||||||
$(FT_LIBRARIAN) $@ $(OBJECTS_LIST)
|
-rpath $(libdir) -version-info $(version_info)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue