ref: 9f27998ebf9099e004f7b868fdea76abb39c7180
parent: deee58f2255fcc652da9ba8bfc8890713216fb12
parent: 3009417a7dd2110d22b0d1d8f2b1931b64e97584
author: Werner Lemberg <[email protected]>
date: Wed Jul 15 08:33:01 EDT 2009
Merge branch 'master' of [email protected]:/srv/git/freetype/freetype2 Conflicts: ChangeLog Merge.
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,21 @@
* README.git: This.
Updated.
+2009-07-15 suzuki toshiya <[email protected]>
+
+ Borland C++ compiler patch proposed by Mirco Babin.
+ http://lists.gnu.org/archive/html/freetype/2009-07/msg00016.html.
+
+ * builds/exports.mk: Delete unused flags, CCexe_{CFLAGS,LDFLAGS}.+ Fix APINAMES_C and APINAMES_EXE pathnames to reflect the platform
+ specific pathname syntax.
+ * builds/compiler/bcc.mk: Remove unused flag, CCexe_LDFLAGS.
+ Define TE = `-e' separately (bcc32 cannot specify the pathname of
+ binary executable by T = `-o').
+ Extend the large page size in linking freetype.lib.
+ Add extra CLEAN target to delete bcc specific temporary files.
+ * builds/compiler/bcc-dev.mk: Ditto.
+
2009-07-14 Werner Lemberg <[email protected]>
Fix Savannah bug #27026.
--- a/builds/compiler/bcc-dev.mk
+++ b/builds/compiler/bcc-dev.mk
@@ -52,7 +52,8 @@
# Target flag -- no trailing space.
#
-T := -o
+T := -o
+TE := -e
# C flags
@@ -72,7 +73,14 @@
# 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
--- a/builds/compiler/bcc.mk
+++ b/builds/compiler/bcc.mk
@@ -52,7 +52,8 @@
# Target flag -- no trailing space.
#
-T := -o
+T := -o
+TE := -e
# C flags
@@ -72,7 +73,14 @@
# 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
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -47,8 +47,8 @@
#
# Note that $(APINAMES_OPTIONS) is empty, except for Windows compilers.
#
- APINAMES_SRC := $(TOP_DIR)/src/tools/apinames.c
- APINAMES_EXE := $(OBJ_DIR)/apinames$(E_BUILD)
+ APINAMES_SRC := $(subst /,$(SEP),$(TOP_DIR)/src/tools/apinames.c)
+ APINAMES_EXE := $(subst /,$(SEP),$(OBJ_DIR)/apinames$(E_BUILD))
$(APINAMES_EXE): $(APINAMES_SRC)
$(CCexe) $(TE)$@ $<
--- a/builds/win32/win32-def.mk
+++ b/builds/win32/win32-def.mk
@@ -22,6 +22,7 @@
# The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
#
E := .exe
+E_BUILD := .exe
# The directory where all library files are placed.