From 3f325e008194e76f2addb53f5522b413305e1f2e Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 19 Nov 2009 08:18:44 +0000 Subject: [PATCH] Attempting to better abstract FreeBSD. --- Execute.mk | 2 +- FreeBSD.mk | 6 ++---- Linux.mk | 14 +------------- PkgConfig.mk | 11 +++++++++++ 4 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 PkgConfig.mk diff --git a/Execute.mk b/Execute.mk index 86c106c..130355f 100644 --- a/Execute.mk +++ b/Execute.mk @@ -1,4 +1,4 @@ -CY_EXECUTE := +CY_EXECUTE := 1 flags += -DCY_EXECUTE code += sig/ffi_type.o sig/parse.o sig/copy.o code += Execute.o Bridge.o diff --git a/FreeBSD.mk b/FreeBSD.mk index 0398df5..3c39e46 100644 --- a/FreeBSD.mk +++ b/FreeBSD.mk @@ -1,4 +1,2 @@ -export PATH := /usr/local/bin:$(PATH) -include Execute.mk -flags += -I/usr/local/include -I/usr/local/include/webkit-1.0 -library += -lwebkit-1.0 +export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH) +include PkgConfig.mk diff --git a/Linux.mk b/Linux.mk index 80fe939..87d0af4 100644 --- a/Linux.mk +++ b/Linux.mk @@ -1,13 +1 @@ -export PATH := /usr/local/bin:$(PATH) - -ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),) -flags += $(shell pkg-config --cflags webkit-1.0) -library += -lwebkit-1.0 -include Execute.mk -else -ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),) -flags += $(shell pkg-config --cflags WebKitGtk) -library += $(shell pkg-config --libs WebKitGtk) -include Execute.mk -endif -endif +include PkgConfig.mk diff --git a/PkgConfig.mk b/PkgConfig.mk new file mode 100644 index 0000000..47fb41f --- /dev/null +++ b/PkgConfig.mk @@ -0,0 +1,11 @@ +ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),) +flags += $(shell pkg-config --cflags webkit-1.0) +library += -lwebkit-1.0 +include Execute.mk +else +ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),) +flags += $(shell pkg-config --cflags WebKitGtk) +library += $(shell pkg-config --libs WebKitGtk) +include Execute.mk +endif +endif -- 2.47.2