diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-07-13 19:24:24 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-07-13 19:24:24 +0200 |
| commit | 22c931e8e5c78823bbc2ef31fcd7b7fc8e1cab55 (patch) | |
| tree | 668f7d8d1cfad789bab48ec2b6492abd63d64333 | |
| parent | 08777e50ad232ac8ac27f322ef8f50ed048ee65f (diff) | |
| download | embtoolkit-22c931e8e5c78823bbc2ef31fcd7b7fc8e1cab55.tar.gz embtoolkit-22c931e8e5c78823bbc2ef31fcd7b7fc8e1cab55.tar.bz2 embtoolkit-22c931e8e5c78823bbc2ef31fcd7b7fc8e1cab55.tar.xz | |
Packages: add freetype-2.4.0
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | packages/graphics/freetype/freetype.kconfig | 32 | ||||
| -rw-r--r-- | packages/graphics/freetype/freetype.mk | 14 |
2 files changed, 23 insertions, 23 deletions
diff --git a/packages/graphics/freetype/freetype.kconfig b/packages/graphics/freetype/freetype.kconfig index c6fe58e..ede4a69 100644 --- a/packages/graphics/freetype/freetype.kconfig +++ b/packages/graphics/freetype/freetype.kconfig @@ -1,24 +1,25 @@ ################################################################################ -# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file freetype.kconfig # \brief freetype.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date October 2009 ################################################################################ @@ -42,6 +43,8 @@ choice help Here you can choose which version of freetype you want to use. + config EMBTK_FREETYPE_VERSION_2_4_0 + bool "FreeType-2.4.0" config EMBTK_FREETYPE_VERSION_2_3_12 bool "FreeType-2.3.12" config EMBTK_FREETYPE_VERSION_2_3_11 @@ -54,8 +57,9 @@ endchoice config EMBTK_FREETYPE_VERSION_STRING string + default "2.4.0" if EMBTK_FREETYPE_VERSION_2_4_0 default "2.3.12" if EMBTK_FREETYPE_VERSION_2_3_12 default "2.3.11" if EMBTK_FREETYPE_VERSION_2_3_11 default "2.3.10" if EMBTK_FREETYPE_VERSION_2_3_10 - default "2.3.9" if EMBTK_FREETYPE_VERSION_2_3_9 + default "2.3.9" if EMBTK_FREETYPE_VERSION_2_3_9 diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk index bf2f1f0..9918430 100644 --- a/packages/graphics/freetype/freetype.mk +++ b/packages/graphics/freetype/freetype.mk @@ -1,6 +1,6 @@ ################################################################################ -# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ # # \file freetype.mk # \brief freetype.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date October 2009 ################################################################################ @@ -96,10 +96,6 @@ freetype_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FREETYPE_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FREETYPE_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FREETYPE_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(FREETYPE_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(FREETYPE_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(FREETYPE_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(FREETYPE_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FREETYPE_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FREETYPE_PKGCONFIGS) |