diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-03 15:43:51 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-03 15:43:51 +0100 |
| commit | 394514c504510e18ef65e0cc1e9bdfeae42e175c (patch) | |
| tree | 62ee15624d6c19352bfa9aca20c710baab66f5f0 | |
| parent | a9f44c3d4d87e28029e59315edce08e7fe3889b1 (diff) | |
rsvglibs: add libpng dependency for cairo
| -rw-r--r-- | cairo/cairo/makefile.mk | 5 | ||||
| -rw-r--r-- | libpng/libpng.patch | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 834095144d21..4bf3911b1ca9 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -173,6 +173,11 @@ CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAG .ENDIF +.IF "$(SYSTEM_LIBPNG)" != "YES" +CONFIGURE_FLAGS+=png_CFLAGS="-I$(SOLARINCDIR)$/external$/libpng" png_LIBS="-L$(SOLARLIBDIR) -lpng" +.ENDIF + + OUT2INC+=cairo-version.h \ src$/cairo-deprecated.h \ src$/cairo-features.h \ diff --git a/libpng/libpng.patch b/libpng/libpng.patch index 26b3098d0467..3bfc76c9131b 100644 --- a/libpng/libpng.patch +++ b/libpng/libpng.patch @@ -46,7 +46,7 @@ + $(SLO)$/pngwutil.obj + +LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a ++LIB1ARCHIV=$(LB)$/$(TARGET).a +LIB1OBJFILES=$(SLOFILES) + +.INCLUDE : target.mk |