summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2012-10-14 22:59:39 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2012-10-14 22:59:39 +0100
commit436f5d659fa4640cab99a22e4e602aed6b16cfe8 (patch)
tree0c140f5fbb0fc85d244cd668c6d4686c2785a98f
parent493872389687e16dc4bb4ecf33f4951101d4ca8f (diff)
downloadnetsurf-436f5d659fa4640cab99a22e4e602aed6b16cfe8.tar.gz
netsurf-436f5d659fa4640cab99a22e4e602aed6b16cfe8.tar.bz2
for native builds, temporarily revert usage of pkg-config for cairo detection
-rw-r--r--amiga/Makefile.target8
1 files changed, 4 insertions, 4 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index f830ba200..f0eabf86e 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -28,7 +28,7 @@ ifeq ($(HOST),amiga)
$(eval $(call feature_enabled,VIDEO,-DWITH_VIDEO -I /SDK/local/newlib/include/glib-2.0,-lgstreamer-0.10 -lglib-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lintl -lffi,Video (libgstreamer)))
$(eval $(call feature_enabled,JS,-DXP_UNIX -DWITH_JS -DJS_VERSION=185,-lstdc++ -lmozjs185,JavaScript))
$(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=170 -DJSVERSION_LATEST=170 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs -lfdlibm,JavaScript))
- $(eval $(call pkg_config_find_and_add,AMIGA_CAIRO,cairo,Cairo))
+ $(eval $(call feature_enabled,AMIGA_CAIRO,-DNS_AMIGA_CAIRO,,Cairo))
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
@@ -36,9 +36,9 @@ ifeq ($(HOST),amiga)
LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
- ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes)
- CFLAGS += -I /SDK/local/common/include/cairo
- LDFLAGS += -use-dynld
+ ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES)
+ CFLAGS += -I /SDK/local/common/include/cairo
+ LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
EXETARGET := NetSurf
else
EXETARGET := NetSurf-Static