projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| 27a626b6 PG |
1 | --- oo_1.0_src/freetype/prj/d.lst.systemft Fri May 31 17:48:49 2002 |
| 2 | +++ oo_1.0_src/freetype/prj/d.lst Fri May 31 17:51:22 2002 | |
| 0e0c63fa | 3 | @@ -2,14 +2,13 @@ |
| 27a626b6 PG |
4 | mkdir: %_DEST%\inc%_EXT%\freetype\config |
| 5 | mkdir: %_DEST%\inc%_EXT%\freetype\internal | |
| 6 | ||
| 7 | -..\%__SRC%\inc\ft2build.h %_DEST%\inc%_EXT%\ft2build.h | |
| 8 | -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\freetype\*.h | |
| 9 | -..\%__SRC%\inc\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h | |
| 10 | -..\%__SRC%\inc\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h | |
| 11 | +\usr\include\ft2build.h %_DEST%\inc%_EXT%\ft2build.h | |
| 12 | +\usr\include\freetype2\freetype\*.h %_DEST%\inc%_EXT%\freetype\*.h | |
| 13 | +\usr\include\freetype2\freetype\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h | |
| 14 | +\usr\include\freetype2\freetype\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h | |
| 15 | ||
| 16 | -..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.* | |
| 17 | +\usr\lib\libfreetype.so.* %_DEST%\lib%_EXT%\libfreetype.so.* | |
| 18 | ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib | |
| 19 | -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a | |
| 27a626b6 PG |
20 | |
| 21 | ..\%__SRC%\lib\freetype.lib %_DEST%\lib%_EXT%\freetype.lib | |
| 22 | ||
| 23 | --- oo_1.0_src/freetype/makefile.mk.systemft Tue Feb 26 12:21:37 2002 | |
| 24 | +++ oo_1.0_src/freetype/makefile.mk Fri May 31 17:48:37 2002 | |
| 0e0c63fa | 25 | @@ -65,6 +65,17 @@ |
| 27a626b6 PG |
26 | PRJNAME=so_freetype |
| 27 | TARGET=so_freetype | |
| 28 | ||
| 29 | +# --- Hack to get system freetype ---------------------------------- | |
| 30 | +.IF "$(GUI)"=="UNX" | |
| 31 | +all: | |
| 32 | + @echo " An already available installation of freetype should exist on your system." | |
| 33 | + @echo " Therefore the version provided here does not need to be built in addition." | |
| 34 | + | |
| 35 | + +$(COPY) /usr$/lib$/libfreetype.so.6* $(DLLDEST) | |
| 27a626b6 PG |
36 | + +$(COPY) -r /usr$/include$/freetype2$/freetype $(DLLDEST)$/..$/inc |
| 37 | + +$(COPY) -r /usr$/include$/ft2build.h $(DLLDEST)$/..$/inc$/freetype | |
| 38 | +.ENDIF | |
| 39 | + | |
| 40 | # --- Settings ----------------------------------------------------- | |
| 41 | ||
| 42 | .INCLUDE : settings.mk | |
| a5ad006a | 43 | @@ -95,14 +106,12 @@ |
| 0e0c63fa MM |
44 | BUILD_DIR=$(CONFIGURE_DIR) |
| 45 | BUILD_ACTION=$(GNUMAKE) | |
| 46 | ||
| 47 | -OUT2LIB= \ | |
| 48 | - objs$/.libs$/libfreetype.a | |
| 49 | .IF "$(OS)"=="MACOSX" | |
| 50 | -OUT2LIB+=objs$/.libs$/libfreetype.*.dylib | |
| 51 | +OUT2LIB=objs$/.libs$/libfreetype.*.dylib | |
| cb6013bc | 52 | .ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" |
| a5ad006a | 53 | -OUT2LIB+=objs$/.libs$/libfreetype.so.9* |
| 54 | +OUT2LIB=objs$/.libs$/libfreetype.so.9* | |
| 0e0c63fa MM |
55 | .ELSE |
| 56 | -OUT2LIB+=objs$/.libs$/libfreetype.so.6* | |
| 57 | +OUT2LIB=objs$/.libs$/libfreetype.so.6* | |
| cb6013bc | 58 | .ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" |
| 0e0c63fa MM |
59 | |
| 60 | .ELSE # "$(GUI)"=="UNX" | |
| db8726fd MM |
61 | --- oo_1.0.2_src.orig/solenv/inc/libs.mk Tue Jan 7 15:22:02 2003 |
| 62 | +++ oo_1.0.2_src/solenv/inc/libs.mk Thu Feb 13 17:29:26 2003 | |
| 63 | @@ -131,7 +131,7 @@ | |
| 64 | VCLLIBST=-lvcl | |
| 65 | VCLLIB=$(SVLIB) | |
| 66 | FREETYPELIB=-lfreetype | |
| 67 | -FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC) | |
| 68 | +FREETYPELIBST=$(DYNAMIC) -lfreetype $(DYNAMIC) | |
| 69 | XPLIB=-l_xp | |
| 70 | TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX) | |
| 71 | SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX) | |
| 72 |