[Xorg-commit] xc/extras/freetype2/builds/compiler ansi-cc.mk,1.1,1.1.4.1 bcc-dev.mk,1.1,1.1.4.1 bcc.mk,1.1,1.1.4.1 gcc-dev.mk,1.1,1.1.4.1 gcc.mk,1.1,1.1.4.1 intelc.mk,1.1,1.1.4.1 unix-lcc.mk,1.1,1.1.4.1 visualage.mk,1.1,1.1.4.1 visualc.mk,1.1,1.1.4.1 watcom.mk,1.1,1.1.4.1 win-lcc.mk,1.1,1.1.4.1
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/extras/freetype2/builds/compiler
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2/builds/compiler
Modified Files:
Tag: XORG-CURRENT
ansi-cc.mk bcc-dev.mk bcc.mk gcc-dev.mk gcc.mk intelc.mk
unix-lcc.mk visualage.mk visualc.mk watcom.mk win-lcc.mk
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: ansi-cc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/ansi-cc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/ansi-cc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/ansi-cc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
# Compiler command line name
#
-CC := cc
+CC := cc
+COMPILER_SEP := $(SEP)
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -74,8 +76,9 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
-LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(AR) -r $@ $(subst /,$(COMPILER_SEP),$(OBJECTS_LIST))
+
# EOF
Index: bcc-dev.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/bcc-dev.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/bcc-dev.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/bcc-dev.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
# Compiler command line name
#
-CC := bcc32
+CC := bcc32
+COMPILER_SEP := $(SEP)
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -72,9 +74,9 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
-TARGET_OBJECTS = $(subst $(SEP),\\,$(OBJECTS_LIST))
-LINK_LIBRARY = tlib /u $(subst $(SEP),\\,$@) $(TARGET_OBJECTS:%=+%)
+LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%))
+
# EOF
Index: bcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/bcc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/bcc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/bcc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
# Compiler command line name
#
-CC := bcc32
+CC := bcc32
+COMPILER_SEP := $(SEP)
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -72,9 +74,9 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
-TARGET_OBJECTS = $(subst $(SEP),\\,$(OBJECTS_LIST))
-LINK_LIBRARY = tlib /u $(subst $(SEP),\\,$@) $(TARGET_OBJECTS:%=+%)
+LINK_LIBRARY = tlib /u $(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST:%=+%))
+
# EOF
Index: gcc-dev.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/gcc-dev.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/gcc-dev.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/gcc-dev.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
# Compiler command line name
#
-CC := gcc
+CC := gcc
+COMPILER_SEP := /
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -62,6 +64,7 @@
#
ifndef CFLAGS
CFLAGS := -c -g -O0 \
+ -fno-strict-aliasing \
-Wall \
-W \
-Wundef \
@@ -82,8 +85,9 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+
# EOF
Index: gcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/gcc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/gcc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/gcc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,9 @@
# Compiler command line name
#
-CC := gcc
+CC := gcc
+COMPILER_SEP := /
+
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
@@ -60,7 +62,7 @@
# ANSI compliance.
#
ifndef CFLAGS
- CFLAGS := -c -g -O6 -Wall
+ CFLAGS := -c -g -O6 -Wall -fno-strict-aliasing
endif
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
@@ -71,8 +73,9 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+
# EOF
Index: intelc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/intelc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/intelc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/intelc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# compiler command line name
#
-CC := icl
+CC := icl
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -79,6 +80,7 @@
# Library linking
#
#CLEAN_LIBRARY =
-LINK_LIBRARY = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
# EOF
Index: unix-lcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/unix-lcc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/unix-lcc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/unix-lcc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# Command line name
#
-CC := lcc
+CC := lcc
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -78,8 +79,9 @@
# library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(PROJECT_LIBRARY)
endif
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
+
# EOF
Index: visualage.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/visualage.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/visualage.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/visualage.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# command line compiler name
#
-CC := icc
+CC := icc
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -71,6 +72,7 @@
# Library linking
#
#CLEAN_LIBRARY :=
-LINK_LIBRARY = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
# EOF
Index: visualc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/visualc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/visualc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/visualc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# compiler command line name
#
-CC := cl
+CC := cl
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -74,6 +75,7 @@
# Library linking
#
#CLEAN_LIBRARY =
-LINK_LIBRARY = lib /nologo /out:$@ $(OBJECTS_LIST)
+LINK_LIBRARY = lib /nologo /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
# EOF
Index: watcom.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/watcom.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/watcom.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/watcom.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# Compiler command line name
#
-CC := wcc386
+CC := wcc386
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -74,8 +75,11 @@
# Library linking
#
ifndef CLEAN_LIBRARY
- CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY))
+ CLEAN_LIBRARY = $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
endif
-LINK_LIBRARY = wlib -q -o = $@ $(OBJECTS_LIST)
+LINK_LIBRARY = $(subst /,$(COMPILER_SEP), \
+ wlib -q -n $@; \
+ $(foreach m, $(OBJECTS_LIST), wlib -q $@ +$(m);) \
+ echo > nul)
# EOF
Index: win-lcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/compiler/win-lcc.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/win-lcc.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/win-lcc.mk 23 Feb 2004 21:32:08 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,7 +15,8 @@
# Command line name
#
-CC := lcc
+CC := lcc
+COMPILER_SEP := $(SEP)
# The object file extension (for standard and static libraries). This can be
@@ -76,6 +77,7 @@
# library linking
#
#CLEAN_LIBRARY :=
-LINK_LIBRARY = lcclib /out:$(subst $(SEP),\\,$@) $(subst $(SEP),\\,$(OBJECTS_LIST))
+LINK_LIBRARY = lcclib /out:$(subst /,$(COMPILER_SEP),$@ $(OBJECTS_LIST))
+
# EOF
More information about the xorg-commit
mailing list