[xorg-commit-diffs]
xc/extras/freetype2/builds/win32 detect.mk, 1.1,
1.1.4.1 w32-bcc.mk, 1.1.4.1, 1.1.4.2 w32-bccd.mk, 1.1.4.1,
1.1.4.2 w32-dev.mk, 1.1.4.1, 1.1.4.2 w32-gcc.mk, 1.1.4.1,
1.1.4.2 w32-icc.mk, 1.1.4.1, 1.1.4.2 w32-intl.mk, 1.1.4.1,
1.1.4.2 w32-mingw32.mk, 1.1.4.1, 1.1.4.2 w32-vcc.mk, 1.1.4.1,
1.1.4.2 w32-wat.mk, 1.1.4.1, 1.1.4.2 win32-def.mk, 1.1.4.1, 1.1.4.2
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:14:26 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/extras/freetype2/builds/win32
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2/builds/win32
Modified Files:
Tag: XORG-CURRENT
detect.mk w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk
w32-icc.mk w32-intl.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk
win32-def.mk
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: detect.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/detect.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/detect.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/detect.mk 15 Apr 2004 10:14:20 -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,
@@ -46,12 +46,12 @@
ifeq ($(PLATFORM),win32)
- DELETE := del
- COPY := copy
+ DELETE := del
+ COPY := copy
+ SEP := $(BACKSLASH)
# gcc Makefile by default
CONFIG_FILE := w32-gcc.mk
- SEP := /
ifeq ($(firstword $(CC)),cc)
CC := gcc
endif
@@ -80,7 +80,6 @@
#
ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
CONFIG_FILE := w32-vcc.mk
- SEP := $(BACKSLASH)
CC := cl
visualc: setup
.PHONY: visualc
@@ -88,7 +87,6 @@
ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
CONFIG_FILE := w32-intl.mk
- SEP := $(BACKSLASH)
CC := cl
visualc: setup
.PHONY: intelc
@@ -96,7 +94,6 @@
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk
- SEP := $(BACKSLASH)
CC := wcc386
watcom: setup
.PHONY: watcom
@@ -104,7 +101,6 @@
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := w32-icc.mk
- SEP := $(BACKSLASH)
CC := icc
visualage: setup
.PHONY: visualage
@@ -112,7 +108,6 @@
ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
CONFIG_FILE := w32-lcc.mk
- SEP := $(BACKSLASH)
CC := lcc
lcc: setup
.PHONY: lcc
@@ -120,7 +115,6 @@
ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32
CONFIG_FILE := w32-mingw32.mk
- SEP := $(BACKSLASH)
CC := gcc
mingw32: setup
.PHONY: mingw32
@@ -128,7 +122,6 @@
ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
CONFIG_FILE := w32-bcc.mk
- SEP := $(BACKSLASH)
CC := bcc32
bcc32: setup
.PHONY: bcc32
@@ -137,7 +130,6 @@
ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-bccd.mk
CC := bcc32
- SEP := /
devel-bcc: setup
.PHONY: devel-bcc
endif
@@ -145,11 +137,11 @@
ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-dev.mk
CC := gcc
- SEP := /
devel-gcc: setup
.PHONY: devel-gcc
endif
endif # test PLATFORM win32
+
# EOF
Index: w32-bcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-bcc.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-bcc.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-bcc.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,11 +13,11 @@
# fully.
-SEP := /
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/bcc.mk
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-bccd.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-bccd.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-bccd.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-bccd.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,14 +13,13 @@
# fully.
-SEP := /
-
include $(TOP_DIR)/builds/win32/win32-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
include $(TOP_DIR)/builds/compiler/bcc-dev.mk
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-dev.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-dev.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-dev.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-dev.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -5,7 +5,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,
@@ -23,10 +23,8 @@
TOP_DIR := .
endif
-SEP := /
-
include $(TOP_DIR)/builds/win32/win32-def.mk
-BUILD := $(TOP_DIR)/builds/devel
+BUILD_DIR := $(TOP_DIR)/devel
include $(TOP_DIR)/builds/compiler/gcc-dev.mk
@@ -34,5 +32,4 @@
include $(TOP_DIR)/builds/link_dos.mk
-
# EOF
Index: w32-gcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-gcc.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-gcc.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-gcc.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,10 +13,6 @@
# fully.
-# the separator must be set before including win32-def
-# as it defaults to "\" on Win32
-SEP := /
-
# include Win32-specific definitions
include $(TOP_DIR)/builds/win32/win32-def.mk
@@ -26,4 +22,5 @@
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-icc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-icc.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-icc.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-icc.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -19,4 +19,5 @@
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-intl.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-intl.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-intl.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-intl.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,11 +13,11 @@
# fully.
-SEP := /
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/intelc.mk
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-mingw32.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-mingw32.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-mingw32.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-mingw32.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,10 +13,6 @@
# fully.
-# the separator must be set before including win32-def
-# as it defaults to "\" on Win32
-SEP := /
-
# include Win32-specific definitions
include $(TOP_DIR)/builds/win32/win32-def.mk
@@ -28,4 +24,5 @@
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-vcc.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-vcc.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-vcc.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-vcc.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,11 +13,11 @@
# fully.
-SEP := /
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/visualc.mk
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
+
# EOF
Index: w32-wat.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/w32-wat.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/w32-wat.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/w32-wat.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,14 +13,11 @@
# fully.
-SEP := /
-ISEP := $(strip \ )
-
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/watcom.mk
# include linking instructions
include $(TOP_DIR)/builds/link_dos.mk
-# EOF
+# EOF
Index: win32-def.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/win32/win32-def.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/win32-def.mk 26 Nov 2003 22:48:23 -0000 1.1.4.1
+++ b/win32-def.mk 15 Apr 2004 10:14:20 -0000 1.1.4.2
@@ -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,
@@ -13,17 +13,10 @@
# fully.
-DELETE := del
-HOSTSEP := $(strip \ )
-BUILD := $(TOP_DIR)$(SEP)builds$(SEP)win32
-PLATFORM := win32
-
-# by default, we use "\" as a separator on Win32
-# but certain compilers accept "/" as well
-#
-ifndef SEP
- SEP := $(HOSTSEP)
-endif
+DELETE := del
+SEP := $(strip \ )
+BUILD_DIR := $(TOP_DIR)/builds/win32
+PLATFORM := win32
# The directory where all object files are placed.
@@ -36,7 +29,7 @@
# make -f %TOP_DIR%/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP_DIR)$(SEP)objs
+ OBJ_DIR := $(TOP_DIR)/objs
endif
@@ -58,4 +51,5 @@
#
NO_OUTPUT = 2> nul
+
# EOF
More information about the xorg-commit-diffs
mailing list