Commit e00615992e672bebf74e19912fc507e4bfc17cfc
2000-12-04T23:34:42
fixing Cygwin build
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 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
diff --git a/builds/cygwin/cygwin-dev.mk b/builds/cygwin/cygwin-dev.mk
index a38367c..9feb294 100644
--- a/builds/cygwin/cygwin-dev.mk
+++ b/builds/cygwin/cygwin-dev.mk
@@ -1,8 +1,8 @@
#
-# FreeType 2 Configuration rules for CygWin + GCC
+# FreeType 2 Configuration rules for Cygwin
#
# Development version without optimizations & libtool
-# and no installation
+# and no installation.
#
@@ -17,6 +17,8 @@
include $(TOP)/builds/cygwin/cygwinddef.mk
+BUILD := $(TOP)/builds/devel
+
include $(TOP)/builds/compiler/gcc-dev.mk
include $(TOP)/builds/link_std.mk
diff --git a/builds/cygwin/cygwinddef.mk b/builds/cygwin/cygwinddef.mk
index 3e9d918..e1e92df 100644
--- a/builds/cygwin/cygwinddef.mk
+++ b/builds/cygwin/cygwinddef.mk
@@ -1,6 +1,6 @@
#
# FreeType 2 configuration rules templates for
-# development under Unix-like platforms with no configure script (gcc only)
+# development under Unix with no configure script (gcc only)
#
@@ -19,13 +19,16 @@ ifndef TOP
endif
TOP := $(shell cd $(TOP); pwd)
-DELETE := rm -f
-SEP := /
-HOSTSEP := $(SEP)
+DELETE := rm -f
+SEP := /
+HOSTSEP := $(SEP)
+
# we use a special devel ftoption.h
-BUILD := $(TOP)/builds/cygwin/devel
-# do not set it to 'cygwin', or libtool will trick you
-PLATFORM := cygwindev
+BUILD := $(TOP)/builds/devel
+
+# do not set the platform to `unix', or libtool will trick you
+PLATFORM := unixdev
+
# The directory where all object files are placed.
#
@@ -33,17 +36,20 @@ ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
endif
+
# library file name
#
LIBRARY := lib$(PROJECT)
+
# The directory where all library files are placed.
#
-# By default, this is the same as $(OBJ_DIR), however, this can be changed
+# By default, this is the same as $(OBJ_DIR); however, this can be changed
# to suit particular needs.
#
LIB_DIR := $(OBJ_DIR)
+
#
NO_OUTPUT := 2> /dev/null
diff --git a/builds/cygwin/ftconfig.in b/builds/cygwin/ftconfig.in
index e3a0d38..02db171 100644
--- a/builds/cygwin/ftconfig.in
+++ b/builds/cygwin/ftconfig.in
@@ -37,13 +37,7 @@
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-
- /* Include the header file containing all developer build options */
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
diff --git a/builds/cygwin/install.mk b/builds/cygwin/install.mk
index 938ac78..16403f6 100644
--- a/builds/cygwin/install.mk
+++ b/builds/cygwin/install.mk
@@ -33,6 +33,7 @@ install: $(PROJECT_LIBRARY)
-for P in $(CACHE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype2/freetype/cache ; \
done
+ $(INSTALL_DATA) $(BUILD)/ft2unix.h $(includedir)/ft2build.h
$(INSTALL_SCRIPT) -m 755 $(BUILD)/freetype-config \
$(bindir)/freetype-config
@@ -53,12 +54,12 @@ uninstall:
# Unix cleaning and distclean rules.
#
-clean_project_cygwin:
+clean_project_unix:
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
$(CLEAN)
-distclean_project_cygwin: clean_project_cygwin
+distclean_project_unix: clean_project_unix
-$(DELETE) $(PROJECT_LIBRARY)
-$(DELETE) $(OBJ_DIR)/.libs/*
-$(DELDIR) $(OBJ_DIR)/.libs