fixing Cygwin build

This commit is contained in:
David Turner 2000-12-04 23:34:42 +00:00
parent 8c8af31f5f
commit e00615992e
4 changed files with 22 additions and 19 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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