From b1b3b20d2439cafd1b258d58f24b3ba01f5f9099 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Tue, 16 Feb 2010 22:20:09 +0000 Subject: [PATCH] [CHG] Changed a couple of Makefile for FreeType --- GRRLIB/lib/freetype2/Makefile | 23 +-- .../builds/compiler/{wii-cc.mk => wii.mk} | 8 +- GRRLIB/lib/freetype2/builds/detect.mk | 154 ------------------ GRRLIB/lib/freetype2/builds/wii/wii-def.mk | 5 +- GRRLIB/lib/freetype2/builds/wii/wii.mk | 21 --- GRRLIB/lib/freetype2/config.mk | 14 +- 6 files changed, 14 insertions(+), 211 deletions(-) rename GRRLIB/lib/freetype2/builds/compiler/{wii-cc.mk => wii.mk} (89%) delete mode 100644 GRRLIB/lib/freetype2/builds/detect.mk delete mode 100644 GRRLIB/lib/freetype2/builds/wii/wii.mk diff --git a/GRRLIB/lib/freetype2/Makefile b/GRRLIB/lib/freetype2/Makefile index d531982..6eed3eb 100644 --- a/GRRLIB/lib/freetype2/Makefile +++ b/GRRLIB/lib/freetype2/Makefile @@ -1,12 +1,3 @@ -# FreeType Makefile - -PROJECT := freetype -PROJECT_TITLE := FreeType -TOP_DIR ?= . -OBJ_DIR ?= $(TOP_DIR) -include $(TOP_DIR)/builds/toplevel.mk - - # Quick'n'dirty makefile [BC] ifeq ($(strip $(DEVKITPPC)),) @@ -17,15 +8,19 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Use export DEVKITPRO=devkitPRO and try again") endif -PREFIX := $(DEVKITPPC)/bin/powerpc-eabi- -CC := $(PREFIX)gcc -AR := $(PREFIX)ar +# FreeType Makefile +PROJECT := freetype +PROJECT_TITLE := FreeType +TOP_DIR ?= . +OBJ_DIR ?= $(TOP_DIR) +include $(TOP_DIR)/builds/toplevel.mk + INCD := $(DEVKITPRO)/libogc/include LIBD := $(DEVKITPRO)/libogc/lib/wii -MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS := -c -O2 $(MACHDEP) -I./include -I/include/freetype/config +clean : + rm -f lib$(PROJECT).a ftmodule.h install : mkdir -p $(LIBD) $(INCD)/freetype/config/ diff --git a/GRRLIB/lib/freetype2/builds/compiler/wii-cc.mk b/GRRLIB/lib/freetype2/builds/compiler/wii.mk similarity index 89% rename from GRRLIB/lib/freetype2/builds/compiler/wii-cc.mk rename to GRRLIB/lib/freetype2/builds/compiler/wii.mk index 7b3e167..6ee85ef 100644 --- a/GRRLIB/lib/freetype2/builds/compiler/wii-cc.mk +++ b/GRRLIB/lib/freetype2/builds/compiler/wii.mk @@ -1,11 +1,8 @@ # -# FreeType 2 generic pseudo ANSI compiler +# FreeType 2 devkitPPC compiler # -# Copyright 1996-2000, 2003, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# # This file is part of the FreeType project, and may only be used, modified, # and distributed under the terms of the FreeType project license, # LICENSE.TXT. By continuing to use, modify, or distribute this file you @@ -63,7 +60,7 @@ T := -o$(space) # ANSI compliance. # MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float -CFLAGS ?= -c -O2 $(MACHDEP) -I./include -I/include/freetype/config +CFLAGS ?= -c -O2 $(MACHDEP) -I$(TOP_DIR)/include # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. # @@ -75,6 +72,7 @@ ANSIFLAGS := # Library linking # CLEAN_LIBRARY ?= $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY)) +AR := $(DEVKITPPC)/bin/powerpc-eabi-ar LINK_LIBRARY = $(AR) -r $@ $(subst /,$(COMPILER_SEP),$(OBJECTS_LIST)) diff --git a/GRRLIB/lib/freetype2/builds/detect.mk b/GRRLIB/lib/freetype2/builds/detect.mk deleted file mode 100644 index 987ae51..0000000 --- a/GRRLIB/lib/freetype2/builds/detect.mk +++ /dev/null @@ -1,154 +0,0 @@ -# -# FreeType 2 host platform detection rules -# - - -# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -# This sub-Makefile is in charge of detecting the current platform. It sets -# the following variables: -# -# BUILD_DIR The configuration and system-specific directory. Usually -# `freetype/builds/$(PLATFORM)' but can be different for -# custom builds of the library. -# -# The following variables must be defined in system specific `detect.mk' -# files: -# -# PLATFORM The detected platform. This will default to `ansi' if -# auto-detection fails. -# CONFIG_FILE The configuration sub-makefile to use. This usually depends -# on the compiler defined in the `CC' environment variable. -# DELETE The shell command used to remove a given file. -# COPY The shell command used to copy one file. -# SEP The platform-specific directory separator. -# COMPILER_SEP The separator used in arguments of the compilation tools. -# CC The compiler to use. -# -# You need to set the following variable(s) before calling it: -# -# TOP_DIR The top-most directory in the FreeType library source -# hierarchy. If not defined, it will default to `.'. - -# Set auto-detection default to `ansi' resp. UNIX-like operating systems. -# -PLATFORM := ansi -DELETE := $(RM) -COPY := cp -CAT := cat -SEP := / - -BUILD_CONFIG := $(TOP_DIR)/builds - -# These two assignments must be delayed. -BUILD_DIR = $(BUILD_CONFIG)/$(PLATFORM) -CONFIG_RULES = $(BUILD_DIR)/$(CONFIG_FILE) - -# We define the BACKSLASH variable to hold a single back-slash character. -# This is needed because a line like -# -# SEP := \ -# -# does not work with GNU Make (the backslash is interpreted as a line -# continuation). While a line like -# -# SEP := \\ -# -# really defines $(SEP) as `\' on Unix, and `\\' on Dos and Windows! -# -BACKSLASH := $(strip \ ) - -# Find all auto-detectable platforms. -# -PLATFORMS := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG)/*/detect.mk))) -.PHONY: $(PLATFORMS) ansi - -# Filter out platform specified as setup target. -# -PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS))) - -# If no setup target platform was specified, enable auto-detection/ -# default platform. -# -ifeq ($(PLATFORM),) - PLATFORM := ansi -endif - -# If the user has explicitly asked for `ansi' on the command line, -# disable auto-detection. -# -ifeq ($(findstring ansi,$(MAKECMDGOALS)),) - # Now, include all detection rule files found in the `builds/' - # directories. Note that the calling order of the various `detect.mk' - # files isn't predictable. - # - include $(wildcard $(BUILD_CONFIG)/*/detect.mk) -endif - -# In case no detection rule file was successful, use the default. -# -ifndef CONFIG_FILE - CONFIG_FILE := ansi.mk - setup: std_setup - .PHONY: setup -endif - -# The following targets are equivalent, with the exception that they use -# a slightly different syntax for the `echo' command. -# -# std_setup: defined for most (i.e. Unix-like) platforms -# dos_setup: defined for Dos-ish platforms like Dos, Windows & OS/2 -# -.PHONY: std_setup dos_setup - -std_setup: - @echo "" - @echo "$(PROJECT_TITLE) build system -- automatic system detection" - @echo "" - @echo "The following settings are used:" - @echo "" - @echo " platform $(PLATFORM)" - @echo " compiler $(CC)" - @echo " configuration directory $(BUILD_DIR)" - @echo " configuration rules $(CONFIG_RULES)" - @echo "" - @echo "If this does not correspond to your system or settings please remove the file" - @echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help." - @echo "" - @echo "Otherwise, simply type \`$(MAKE)' again to build the library," - @echo "or \`$(MAKE) refdoc' to build the API reference (the latter needs python)." - @echo "" - @$(COPY) $(CONFIG_RULES) $(CONFIG_MK) - - -# Special case for Dos, Windows, OS/2, where echo "" doesn't work correctly! -# -dos_setup: - @type builds$(SEP)newline - @echo $(PROJECT_TITLE) build system -- automatic system detection - @type builds$(SEP)newline - @echo The following settings are used: - @type builds$(SEP)newline - @echo platform˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙$(PLATFORM) - @echo compiler˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙$(CC) - @echo configuration directory˙˙˙˙˙˙$(subst /,$(SEP),$(BUILD_DIR)) - @echo configuration rules˙˙˙˙˙˙˙˙˙˙$(subst /,$(SEP),$(CONFIG_RULES)) - @type builds$(SEP)newline - @echo If this does not correspond to your system or settings please remove the file - @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. - @type builds$(SEP)newline - @echo Otherwise, simply type 'make' again to build the library. - @echo or 'make refdoc' to build the API reference (the latter needs python). - @type builds$(SEP)newline - @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul - - -# EOF diff --git a/GRRLIB/lib/freetype2/builds/wii/wii-def.mk b/GRRLIB/lib/freetype2/builds/wii/wii-def.mk index 1bdcb93..5a01d14 100644 --- a/GRRLIB/lib/freetype2/builds/wii/wii-def.mk +++ b/GRRLIB/lib/freetype2/builds/wii/wii-def.mk @@ -1,11 +1,8 @@ # -# FreeType 2 configuration rules for a `normal' ANSI system +# FreeType 2 configuration rules # -# Copyright 1996-2000, 2003, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# # This file is part of the FreeType project, and may only be used, modified, # and distributed under the terms of the FreeType project license, # LICENSE.TXT. By continuing to use, modify, or distribute this file you diff --git a/GRRLIB/lib/freetype2/builds/wii/wii.mk b/GRRLIB/lib/freetype2/builds/wii/wii.mk deleted file mode 100644 index 5d4e9cd..0000000 --- a/GRRLIB/lib/freetype2/builds/wii/wii.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# FreeType 2 configuration rules for a `normal' pseudo ANSI compiler/system -# - - -# Copyright 1996-2000 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -include $(TOP_DIR)/builds/wii/wii-def.mk -include $(TOP_DIR)/builds/compiler/wii-cc.mk -include $(TOP_DIR)/builds/link_std.mk - - -# EOF diff --git a/GRRLIB/lib/freetype2/config.mk b/GRRLIB/lib/freetype2/config.mk index ef88369..cd076c1 100644 --- a/GRRLIB/lib/freetype2/config.mk +++ b/GRRLIB/lib/freetype2/config.mk @@ -3,27 +3,15 @@ # -# Copyright 1996-2000 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# # This file is part of the FreeType project, and may only be used, modified, # and distributed under the terms of the FreeType project license, # LICENSE.TXT. By continuing to use, modify, or distribute this file you # indicate that you have read the license and understand and accept it # fully. -DELETE := rm -f -SEP := / - -COMPILER_SEP := $(SEP) - -# Library linking -# -CLEAN_LIBRARY ?= $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY)) -LINK_LIBRARY = $(AR) -r $@ $(subst /,$(COMPILER_SEP),$(OBJECTS_LIST)) include $(TOP_DIR)/builds/wii/wii-def.mk -include $(TOP_DIR)/builds/compiler/wii-cc.mk +include $(TOP_DIR)/builds/compiler/wii.mk include $(TOP_DIR)/builds/link_std.mk