Adapting changes for Unix to other makefiles.

builds/ansi/ansi.mk

@@ -23,17 +23,19 @@ HOSTSEP  := $(SEP)
 BUILD    := $(TOP)/builds/ansi
 PLATFORM := ansi
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f $TOP/Makefile setup [options]
 #   make -f $TOP/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/dos/dos-gcc.mk

@@ -23,17 +23,19 @@ HOSTSEP  := $(strip \ )
 BUILD    := $(TOP)/builds/dos
 PLATFORM := dos
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/os2/os2-dev.mk

@@ -26,17 +26,19 @@ BUILD    := $(TOP)/builds/os2
 PLATFORM := os2
 CC       := gcc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/os2/os2-gcc.mk

@@ -24,17 +24,19 @@ BUILD    := $(TOP)/builds/os2
 PLATFORM := os2
 CC       := gcc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
-#   make -f %TOP%/Makefile setup [options]
-#   make -f %TOP%/Makefile
+#   set OBJ_DIR=.../path/to/obj/dir
+#   make -f %TOP%Makefile setup [options]
+#   make -f %TOP%Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/win32/w32-dev.mk

@@ -29,17 +29,19 @@ BUILD    := $(TOP)/builds/win32
 PLATFORM := win32
 CC       := gcc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/win32/w32-gcc.mk

@@ -27,17 +27,19 @@ BUILD    := $(TOP)/builds/win32
 PLATFORM := win32
 CC       := gcc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/win32/w32-icc.mk

@@ -20,17 +20,19 @@ BUILD    := $(TOP)$(SEP)config$(SEP)win32
 PLATFORM := win32
 CC       := icc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/win32/w32-lcc.mk

@@ -24,17 +24,19 @@ BUILD    := $(TOP)/builds/win32
 PLATFORM := win32
 CC       := lcc
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.

builds/win32/w32-vcc.mk

@@ -24,17 +24,19 @@ BUILD    := $(TOP)/builds/win32
 PLATFORM := win32
 CC       := cl
 
+
 # The directory where all object files are placed.
 #
-# Note that this is not $(TOP)/obj!
 # This lets you build the library in your own directory with something like
 #
 #   set TOP=.../path/to/freetype2/top/dir...
-#   mkdir obj
+#   set OBJ_DIR=.../path/to/obj/dir
 #   make -f %TOP%/Makefile setup [options]
 #   make -f %TOP%/Makefile
 #
-OBJ_DIR := obj
+ifndef OBJ_DIR
+  OBJ_DIR := $(TOP)$(SEP)obj
+endif
 
 
 # The directory where all library files are placed.