Commit 9140ae06a68b5ccdbc48a5de994c3d50a8a8bc7e
2000-11-01T20:27:13
Adding rules for mingw32 compiler.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/builds/link_dos.mk b/builds/link_dos.mk
index 09dda0a..5b1d497 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 53133c0..ecba73b 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 cf1fbd2..d6871ed 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 af47bd7..4a835f8 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 81638a3..665a441 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