Index: freetype-2.0.5.patch =================================================================== RCS file: /cvs/oo/external/freetype/freetype-2.0.5.patch,v retrieving revision 1.2.4.1 diff -u -r1.2.4.1 freetype-2.0.5.patch --- freetype-2.0.5.patch 2002/03/11 13:20:15 1.2.4.1 +++ freetype-2.0.5.patch 2002/06/07 04:52:49 @@ -116,3 +116,22 @@ verstring="sgi$major.$revision" # Add in all the interfaces that we are compatible with. +*** misc/build/freetype-2.0.5/builds/unix/configure Thu Jun 6 21:09:19 2002 +--- misc/build/freetype-2.0.5/builds/unix/configure Thu Jun 6 21:02:08 2002 +*************** +*** 5590,5596 **** + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. +! archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' + hardcode_direct=yes +--- 5590,5596 ---- + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. +! archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -flat_namespace -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' + hardcode_direct=yes Index: makefile.mk =================================================================== RCS file: /cvs/oo/external/freetype/makefile.mk,v retrieving revision 1.5.4.1 diff -u -r1.5.4.1 makefile.mk --- makefile.mk 2002/02/26 11:21:37 1.5.4.1 +++ makefile.mk 2002/06/07 04:52:51 @@ -71,6 +71,13 @@ # --- Files -------------------------------------------------------- +.IF "$(GUIBASE)" == "aqua" + +dummy: + @echo "Nothing to build for GUIBASE $(GUIBASE)" + +.ELSE # "$(GUIBASE)" == "aqua" + TARFILE_NAME=freetype-2.0.5 PATCH_FILE_NAME=freetype-2.0.5.patch @@ -90,7 +97,8 @@ .IF "$(GUI)"=="UNX" OUT2LIB= \ objs$/.libs$/libfreetype.a \ - objs$/.libs$/libfreetype.so.6* + objs$/.libs$/libfreetype.so.6* \ + objs$/.libs$/libfreetype.*.dylib .ENDIF # "$(GUI)"=="UNX" @@ -112,6 +120,8 @@ OUTDIR2INC= \ include$/freetype$/internal \ include$/freetype$/config + +.ENDIF # "$(GUIBASE)" == "aqua" # --- Targets ------------------------------------------------------