From c34deaafb03e86f160c774e0c883e73f3dd1e59c Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 11 Aug 2005 16:27:20 +0000 Subject: [PATCH] work on frameworks git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1031 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 4 ++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/ngobjweb.make | 24 ++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index f775f7c9..96730e22 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2005-08-11 Helge Hess + + * ngobjweb.make: added support for OSX frameworks (v4.5.186) + 2005-08-11 Marcus Mueller * Defaults.plist: changed 'NGLogDefaultAppenderClass' from diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index d5165dbb..5751d673 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=185 +SUBMINOR_VERSION:=186 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 diff --git a/sope-appserver/NGObjWeb/ngobjweb.make b/sope-appserver/NGObjWeb/ngobjweb.make index c8bdd44d..f59e0bcf 100644 --- a/sope-appserver/NGObjWeb/ngobjweb.make +++ b/sope-appserver/NGObjWeb/ngobjweb.make @@ -1,11 +1,31 @@ -# $Id: ngobjweb.make 14 2004-08-20 21:07:18Z helge $ +# settings for NGObjWeb based applications WO_LDFLAGS = -WO_LIBS = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions WO_DEFINE = -DNGObjWeb_LIBRARY=1 +ifneq ($(frameworks),yes) + +WO_LIBS = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions + ifeq ($(FOUNDATION_LIB),apple) WO_LIBS += \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC endif + +else + +WO_LIBS = \ + -framework NGObjWeb \ + -framework NGMime \ + -framework NGStreams \ + -framework NGExtensions + +ifeq ($(FOUNDATION_LIB),apple) +WO_LIBS += \ + -framework NGMime \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework XmlRpc -framework DOM -framework SaxObjC +endif + +endif -- 2.39.5