From 3781dcda893d034ce092dbc3b6617379ab6419fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 8 Nov 2008 22:47:53 +0000 Subject: [PATCH] * Copy the FreeType headers to the 3rdparty headers. (Tested with WonderBrush source and it works fine.) * Updated WonderBrush package. The new version is compiled on Haiku and improves the installation of the document mimetype (finally a more reliable sniffer rule, thanks to Francois for helping me with this). The About window is fixed to no longer use a hardcoded font file path. This version only runs on Haiku, but it is fully unlocked! Next version with new features won't be. Also comes with a new vector icon for the native document type. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28570 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index cdd4298b77..7fe9910e0d 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -171,8 +171,7 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { # Development -if [ IsOptionalHaikuImagePackageAdded Development ] - && $(TARGET_ARCH) = x86 { +if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { # glue code AddFilesToHaikuImage develop lib x86 : crti.o crtn.o @@ -213,6 +212,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] # TODO: Change BEINCLUDES and gcc to refer to 3rdparty rather than gnu. # third party libs headers + AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; @@ -493,8 +493,9 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 { Echo "No optional package WonderBrush available for gcc4" ; } else { - InstallOptionalHaikuImagePackage WonderBrush - : http://www.yellowbites.com/downloads/WonderBrush-2.1.1-demo-x86-R5.zip + local baseURL = ttp://www.yellowbites.com/downloads ; + InstallOptionalHaikuImagePackage WonderBrush-2.1.2-Haiku + : $(baseURL)/WonderBrush-2.1.2-gcc2-x86-Haiku.zip : apps ; AddSymlinkToHaikuImage home config be Applications