diff options
| author | Mox Soini <mox@openoffice.org> | 2008-07-13 11:36:45 +0000 |
|---|---|---|
| committer | Mox Soini <mox@openoffice.org> | 2008-07-13 11:36:45 +0000 |
| commit | db3b2f61f4ed0fdc3f3e3e0f6b626d34ec6b55c2 (patch) | |
| tree | e8ccee17a0434a3616c4a3d0011acd59ab5f9661 /cairo | |
| parent | b43a150c89ad6248bf8319580c52e05c74cef268 (diff) | |
Better fix for Mac OS X / X11 - include/lib files
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 413f874a95f1..831c29cf620a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: mox $ $Date: 2008-07-13 11:34:49 $ +# last change: $Author: mox $ $Date: 2008-07-13 12:36:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -63,8 +63,8 @@ CAIROVERSION=1.6.4 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION) #PATCH_FILE_NAME=$(TARFILE_NAME).patch -cairo_CFLAGS=-I$(SOLARINCDIR) -cairo_LDFLAGS=-L$(SOLARLIBDIR) +cairo_CFLAGS=-I$(SOLARINC) +cairo_LDFLAGS=-L$(SOLARLIB) # pixman is in this module pixman_CFLAGS=-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc @@ -113,8 +113,7 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ELIF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ELIF "$(OS)"=="MACOSX" # X11 on Mac OS X -cairo_CFLAGS+=-I/usr/X11/include -cairo_LDFLAGS+=-L/usr/X11/lib -lfontconfig -lXrender +cairo_LDFLAGS+=-lfontconfig -lXrender .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(SYSBASE)"!="" |