ref: 9140ae06a68b5ccdbc48a5de994c3d50a8a8bc7e
parent: ab8552321c70e947fedfd31709c43c4cb27d496f
author: Werner Lemberg <[email protected]>
date: Wed Nov 1 15:27:13 EST 2000
Adding rules for mingw32 compiler.
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@@ -29,9 +29,9 @@
# 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
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@@ -29,10 +29,10 @@
# 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
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@@ -65,7 +65,7 @@
# 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
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@@ -64,7 +64,7 @@
# 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
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -82,6 +82,13 @@
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