diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-05-29 10:01:30 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-05-29 10:01:30 +0200 |
| commit | a29d92e6cd33325a21974b15a788bbe94736f59b (patch) | |
| tree | 7e39d7dc043d708fd268f25d4abc6b91e82a063b /Makerules | |
| parent | 8313c963dafa0b6774f1d30539c090c313b25c02 (diff) | |
| download | mupdf-a29d92e6cd33325a21974b15a788bbe94736f59b.tar.xz | |
Clean up thirdparty / system library makefile variables.
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -25,17 +25,31 @@ endif # Mac OS X doesn't have pkg-config so we hard code paths. ifeq "$(OS)" "Darwin" -SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2 SYS_X11_CFLAGS = -I/usr/X11R6/include SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext + +SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2 +SYS_FREETYPE_LIBS = -lfreetype +SYS_OPENJPEG_LIBS = -lopenjpeg +SYS_JBIG2DEC_LIBS = -ljbig2dec +SYS_JPEG_LIBS = -ljpeg +SYS_ZLIB_LIBS = -lz + RANLIB_CMD = ranlib $@ -# Other Unixes use pkg-config for system third party libs +# Other Unixes use pkg-config for system libraries. else -SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) -SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) + +SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) +SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) +SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) +SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) +SYS_JBIG2DEC_LIBS = -ljbig2dec +SYS_JPEG_LIBS = -ljpeg +SYS_ZLIB_LIBS = -lz + endif # The following section is an example of how to simply do cross-compilation @@ -105,4 +119,3 @@ RANLIB_CMD = $(PLATFORM_DEVELOPER_BIN_DIR)/ranlib $@ CROSSCOMPILE=yes NOX11=yes endif - |