gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fix for building bundles on Apple - make sure you can link them

Browse source 
against libraries so that all symbols are resolved as required by two
level namespaces


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@15878 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2003-02-05 03:12:07 +00:00
parent 0c57e3d96a
commit 1377ea34b1
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Feb 5 04:07:05 2003 Nicola Pero <n.pero@mi.flashnet.it>
* library-combo.make (BUNDLE_LIBS): For apple library-combo,
do not add -framework Foundation and -framework AppKit.
* Instance/bundle.make: Link bundle to all libs on Apple so
that it can be made to work with two-level namespaces.
Fri Jan 31 01:20:59 2003 Nicola Pero <n.pero@mi.flashnet.it>
* openapp.in: Added new option --find. Calling 'openapp --find

12
Instance/bundle.make
View file

@ -59,7 +59,17 @@ ifneq ($(OBJ_FILES_TO_LINK),)
# libraries ...)
# On windows, this is unfortunately required.
ifeq ($(WITH_DLL),yes)
ifeq ($(WITH_DLL), yes)
LINK_BUNDLE_AGAINST_ALL_LIBS = yes
endif
# On Apple, two-level namespaces require all symbols in bundles
# to be resolved at link time.
ifeq ($(FOUNDATION_LIB), apple)
LINK_BUNDLE_AGAINST_ALL_LIBS = yes
endif
ifeq ($(LINK_BUNDLE_AGAINST_ALL_LIBS), yes)
BUNDLE_LIBS += $(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(BACKEND_LIBS) \
$(GUI_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \

2
library-combo.make
View file

@ -164,7 +164,6 @@ ifeq ($(FOUNDATION_LIB), apple)
FND_LIBS = -framework Foundation
FND_DEFINE = -DNeXT_Foundation_LIBRARY=1
LIBRARIES_DEPEND_UPON += -framework Foundation
BUNDLE_LIBS += -framework Foundation
endif
#
@ -214,7 +213,6 @@ ifeq ($(GUI_LIB), apple)
INTERNAL_OBJCFLAGS += -framework AppKit
GUI_LIBS = -framework AppKit
LIBRARIES_DEPEND_UPON += -framework AppKit
BUNDLE_LIBS += -framework AppKit
endif
SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)