Ticket #51912: patch-Makerules.diff

File patch-Makerules.diff, 1012 bytes (added by harciga, 8 years ago)

  • Makerules

    old new  
    6565
    6666SYS_CURL_DEPS = -lpthread
    6767
    68 SYS_X11_CFLAGS = -I/usr/X11R6/include
    69 SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
     68SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
     69SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
    7070
    71 SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
    72 SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
     71SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
     72SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
    7373SYS_OPENJPEG_LIBS = -lopenjpeg
     74SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
     75SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
    7476SYS_JBIG2DEC_LIBS = -ljbig2dec
    7577SYS_JPEG_LIBS = -ljpeg
    7678SYS_ZLIB_LIBS = -lz
    7779
    78 CC = xcrun cc
    79 AR = xcrun ar
    80 LD = xcrun ld
    81 RANLIB_CMD = xcrun ranlib $@
     80CC = cc
     81AR = ar
     82LD = ld
     83RANLIB_CMD = ranlib $@
    8284
    8385# Linux uses pkg-config for system libraries.
    8486else ifeq "$(OS)" "Linux"