diff -c /Developer/OpenOffice/Backup Branches/ooo_stable_1/freetype/makefile.mk ./makefile.mk *** /Developer/OpenOffice/Backup Branches/ooo_stable_1/freetype/makefile.mk Tue Feb 26 05:21:37 2002 --- ./makefile.mk Wed Jul 24 19:11:11 2002 *************** *** 71,76 **** --- 71,83 ---- # --- 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,96 **** --- 97,107 ---- .IF "$(GUI)"=="UNX" OUT2LIB= \ objs$/.libs$/libfreetype.a \ + .IF "$(OS)"=="MACOSX" + objs$/.libs$/libfreetype.*.dylib + .ELSE objs$/.libs$/libfreetype.so.6* + .ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(GUI)"=="UNX" *************** *** 129,132 **** --- 140,144 ---- ALLTAR : TG_DELIVER .ENDIF # "$(BUILD_SOSL)"!="" + .ENDIF # "$(GUIBASE)" == "aqua"