66 lines
2.0 KiB
Plaintext
66 lines
2.0 KiB
Plaintext
$NetBSD: patch-ab,v 1.5 2014/01/09 14:25:23 mef Exp $
|
|
|
|
o Handle the various operating systems in the same way avoiding hardcoding
|
|
o Build and link with openjpeg-2.0
|
|
o libcurl (www/curl) support
|
|
|
|
--- Makerules.orig 2013-08-14 12:41:20.000000000 +0000
|
|
+++ Makerules
|
|
@@ -24,52 +24,26 @@ else
|
|
$(error unknown build setting: '$(build)')
|
|
endif
|
|
|
|
-# Windows (MINGW) build doesn't use system libraries.
|
|
-ifeq "$(OS)" "MINGW"
|
|
-NOX11 ?= yes
|
|
-
|
|
-# Mac OS X doesn't have pkg-config so we hard code paths.
|
|
-else ifeq "$(OS)" "Darwin"
|
|
-SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL
|
|
-SYS_OPENSSL_LIBS = -lcrypto
|
|
-
|
|
-SYS_CURL_DEPS = -lpthread
|
|
-
|
|
-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 libraries.
|
|
-else
|
|
-
|
|
ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
|
|
SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
|
|
SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
|
|
endif
|
|
|
|
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
|
|
SYS_CURL_DEPS = -lpthread -lrt
|
|
+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
|
|
|
|
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_OPENJPEG_CFLAGS = -I@PREFIX@/include/openjpeg-2.0
|
|
+SYS_OPENJPEG_LIBS = -lopenjp2
|
|
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
|
|
# using these Makefiles. It builds for a beagleboard running ARM linux,
|
|
# compiling on windows with the CodeSourcery G++ compilers.
|