From 9140ae06a68b5ccdbc48a5de994c3d50a8a8bc7e Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 1 Nov 2000 20:27:13 +0000
Subject: [PATCH] Adding rules for mingw32 compiler.

---
 builds/link_dos.mk     | 6 +++---
 builds/link_std.mk     | 6 +++---
 builds/os2/os2-dev.mk  | 2 +-
 builds/os2/os2-gcc.mk  | 2 +-
 builds/win32/detect.mk | 7 +++++++
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/builds/link_dos.mk b/builds/link_dos.mk
index 09dda0aca..5b1d497e7 100644
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@@ -29,9 +29,9 @@ ifdef BUILD_PROJECT
   # this is compiler-specific
   #
   $(PROJECT_LIBRARY): $(OBJECTS_LIST)
-ifdef CLEAN_LIBRARY
-	-$(CLEAN_LIBRARY) $(NO_OUTPUT)
-endif
+    ifdef CLEAN_LIBRARY
+	  -$(CLEAN_LIBRARY) $(NO_OUTPUT)
+    endif
 	$(LINK_LIBRARY)
 
 endif
diff --git a/builds/link_std.mk b/builds/link_std.mk
index 53133c02c..ecba73b8e 100644
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@@ -29,10 +29,10 @@ ifdef BUILD_PROJECT
   # this is compiler-specific
   #
   $(PROJECT_LIBRARY): $(OBJECTS_LIST)
-ifdef CLEAN_LIBRARY
+    ifdef CLEAN_LIBRARY
 	  -$(CLEAN_LIBRARY) $(NO_OUTPUT)
-endif
-	  $(LINK_LIBRARY)
+    endif
+	$(LINK_LIBRARY)
 
 endif
 
diff --git a/builds/os2/os2-dev.mk b/builds/os2/os2-dev.mk
index cf1fbd2b3..d6871ed8e 100644
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@@ -65,7 +65,7 @@ SA := a
 # The name of the final library file.  Note that the DOS-specific Makefile
 # uses a shorter (8.3) name.
 #
-LIBRARY := libfreetype
+LIBRARY := lib$(PROJECT)
 
 
 # Path inclusion flag.  Some compilers use a different flag than `-I' to
diff --git a/builds/os2/os2-gcc.mk b/builds/os2/os2-gcc.mk
index af47bd7e0..4a835f844 100644
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@@ -64,7 +64,7 @@ SA := a
 # The name of the final library file.  Note that the DOS-specific Makefile
 # uses a shorter (8.3) name.
 #
-LIBRARY := libfreetype
+LIBRARY := lib$(PROJECT)
 
 
 # Path inclusion flag.  Some compilers use a different flag than `-I' to
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 81638a394..665a4416b 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -82,6 +82,13 @@ ifeq ($(PLATFORM),ansi)
       lcc: setup
     endif
 
+    ifneq ($(findstring mingw32,$(MAKECMDGOALS)),)     # mingw32
+      CONFIG_FILE := w32-mingw32.mk
+      SEP         := $(BACKSLASH)
+      CC          := gcc
+      mingw32: setup
+    endif
+
     ifneq ($(findstring devel,$(MAKECMDGOALS)),)       # development target
       CONFIG_FILE := w32-dev.mk
       CC          := gcc